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

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

From: Nathan Nobbe <quickshiftin_at_gmail.com>
Date: Fri, 20 Feb 2009 14:15:58 -0700

On Fri, Feb 20, 2009 at 9:20 AM, Stefan Sperling <stsp_at_elego.de> wrote:

> 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

ok, so let me see what i have learned. the main thing to remember is that
after re-integration, no more merges down from upstream; OR, if that has to
be done, simply delete and re-branch (even w/ the same branch name); the
working copies will be fine and subsequent merges down from upstream can
happen until the reintegration of that branch.

we can probly live with this. in fact, after reading through the post and
thinking for a bit, i wondered why we even merged down from upstream after
reintegration in the first place.. im not entirely sure it was necessary.
here i have learned that svn does have a limitation, but the good news is
theres a workaround and i know have something in mind to keep an eye out
for. i really appreciate your response, Stefan.

-nathan

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-02-20 22:29:35 CET

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