[Svnmerge] Merge Issues

[Raman Gupta]

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