[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

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

From: Nathan Nobbe <quickshiftin_at_gmail.com>
Date: Fri, 20 Feb 2009 08:57:28 -0700

hi,

we are migrating to svn1.5 at the office. ive been running some tests using
the svn1.5.5 merge tracking and ive run a simple bidirectional merge test,
and i dont see it leveraging the merge tracking. let me illustrate the
flow, and open up the floor to folks who can clarify things for me.

imagine there is a file in a branch, $branches/test/a.c, then a branch is
created from there,

svn cp $branches/test $branches/test-b

ok, now, we checkout both branchs, and make a change to a.c, in test-b, and
commit it.

cd test-b
vi a.c # add a line
svn commit a.c

then we merge back to upstream,

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 .

ideally, this merge will exclude changesets that came from our last merge of
test-b -> test. however, ive found that the change which was since removed
in test-b is put back after the merge down from test, ouch :(

this seems like a trivial case where merge tracking should be able to tell
the changeset that came from an old version of the target branch, and
therefore should not be merged. here are some things about our setup to
consider:

running svn-1.5.5 on a centos 64 bit server
running svn-1.5 client

i can see the merge tracking is at least on by checking the propeties, so i
know ive gotten that far,

phdelnnobbe:mergetest3-b nnobbe$ svn propget svn:mergeinfo .
/branches/mergetest3:27455-27458

your comments and guidance appreciated,

-nathan

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-02-20 17:00:07 CET

This is an archived mail posted to the Subversion Users mailing list.