[Svnmerge] Unexpected conflicts

[Alexey Kulikov]

Think of a merge as a comparison between two trees. When you are  
merging back to trunk — the comparison starts back at the revision  
where you branched off, hence the conflicts.
Merge back to trunk without using svnmerge and you shall see light

/branch/svnmerge merge
/branch/svn ci -m "changes"
/trunk/svn merge . at HEAD path_to_branch at HEAD
/trunk/svn ci -m "merged branch to trunk"

enjoy!


10 Mar 2009, в 22:33, Jon Schewe написал(а):

> I have trunk and a branch named developer that is a branch off  
> trunk. I
> do the following:
> 1) someone makes changes on trunk
> 2) I make changes on developer
> 3) I pull changes from trunk in developer with "svnmerge.py merge -b"
> 4) I see conflicts and fix them and commit with "svn commit -F
> svnmerge-commit-message.txt"
> 5) I make some more changes in developer
> 6) I goto a working directory of trunk
> 7) svn update
> 8) svnmerge.py merge -b -S developer
> I now have conflicts again. In fact they are the same ones I fixed  
> back
> in step 4. Why?
>
>
> -- 
> Jon Schewe | http://mtu.net/~jpschewe
> If you see an attachment named signature.asc, this is my digital
> signature. See http://www.gnupg.org for more information.
>
> For I am convinced that neither death nor life, neither angels nor
> demons, neither the present nor the future, nor any powers,
> neither height nor depth, nor anything else in all creation, will
> be able to separate us from the love of God that is in Christ
> Jesus our Lord. - Romans 8:38-39
>
> _______________________________________________
> Svnmerge mailing list
> Svnmerge at orcaware.com
> http://www.orcaware.com/mailman/listinfo/svnmerge

-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/pkcs7-signature
Size: 2439 bytes
Desc: not available
URL: </pipermail/svnmerge/attachments/20090310/a49a68df/attachment-0002.bin>