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
imagine there is a file in a branch, $branches/test/a.c, then a branch is
svn cp $branches/test $branches/test-b
ok, now, we checkout both branchs, and make a change to a.c, in test-b, and
cd test-b
then we merge back to upstream,
cd ..
now the change from test-b is in test. so now, we go into test-b, and
cd test-b
next, we decide to merge stuff thats been done on test back down into
svn up
ideally, this merge will exclude changesets that came from our last merge of
this seems like a trivial case where merge tracking should be able to tell
running svn-1.5.5 on a centos 64 bit server
i can see the merge tracking is at least on by checking the propeties, so i
phdelnnobbe:mergetest3-b nnobbe$ svn propget svn:mergeinfo .
your comments and guidance appreciated,
-nathan
------------------------------------------------------
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
|
This is an archived mail posted to the Subversion Users mailing list.
This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.