On Fri, Feb 20, 2009 at 08:57:28AM -0700, Nathan Nobbe wrote:
>
> 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
Don't go on using $branches/test-b after you have reintegrated it.
You want to svn rm $branches/test-b at this point.
If you need it again, re-branch.
See http://blogs.open.collab.net/svn/2008/07/subversion-merg.html
Stefan
> 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
Received on 2009-02-20 17:21:23 CET