[Svnmerge] Merge Issues

[Prakash P M S]

> Date: Fri, 6 May 2011 17:42:36 -0400
> From: rocketraman at fastmail.fm
> To: svnmerge at orcaware.com
> CC: prakashpms at hotmail.com
> Subject: Re: [Svnmerge] Merge Issues
> 
> On 05/06/2011 11:05 AM, Prakash P M S wrote:
> > While merging by cherry picking the revisions using svnmerge.py,
> > svnmerge.py creates issue if there are merge conflicts.
> > 
> > If two versions 5118 and 5145 are merged, if there is a conflict due
> > to revision 5118, it attempts to merge 5145, but the changes of 5145
> > are not merged. When the conflicts are resolved manually, only the
> > changes of 5118 are present in the merged file. First it doesn't even
> > alert that 5145 changes are not merged, but shows that merge being
> > done for that revision. Even if we want to merge it manually after
> > resolving first conflict, it doesn't allow to merge as it is not a
> > clean workspace.
> > 
> > Is there a better way to handle this with svnmerge.py?
> 
> I haven't looked at the details of your problem, but assuming
> everything you say is true, try cherry-picking one revision at a time.
> 
> Cheers,
> Raman

I have to merge all revisions that go for the build cycle by either one revision at a time or merging all of them together. But it can be commited only after merging all revisions and testing the workspace.

-- Thanks
 		 	   		  
-------------- next part --------------
An HTML attachment was scrubbed...
URL: </pipermail/svnmerge/attachments/20110509/0f0238f1/attachment.html>