RE: svn1.5 seems to fail simple merge-tracking scenario

You missed a step. After you --reintegrate, you need to destroy the branch and then recreate it from the merge point on the trunk.

http://svnbook.red-bean.com/en/1.5/svn.branchmerge.basicmerging.html
In Subversion 1.5, once a --reintegrate merge is done from branch to trunk, the branch is no longer usable for further work. It's not able to correctly absorb new trunk changes, nor can it be properly reintegrated to trunk again. For this reason, if you want to keep working on your feature branch, we recommend destroying it and then re-creating it from the trunk:

=============================================================
From: Nathan Nobbe [mailto:quickshiftin_at_gmail.com]
Sent: Friday, February 20, 2009 10:57 AM
To: users_at_subversion.tigris.org
Subject: Fwd: svn1.5 seems to fail simple merge-tracking scenario

cd ..
svn up test
svn merge --reintegrate $branches/test-b test
svn commit -m 'merge --reintegrate test-b' test

now the change from test-b is in test. so now, we go into test-b, and decide to remove the change we first made to a.c and commit it.

cd test-b
vi a.c # remove the line we added before
svn commit a.c

next, we decide to merge stuff thats been done on test back down into test-b.

svn up
svn merge $branches/test .

*****

The information transmitted is intended only for the person or entity to which it is addressed and may contain confidential, proprietary, and/or privileged material. Any review, retransmission, dissemination or other use of, or taking of any action in reliance upon this information by persons or entities other than the intended recipient is prohibited. If you received this in error, please contact the sender and delete the material from all computers. GA622

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=1215759

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-02-23 19:10:50 CET