[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: Mark Phippard <markphip_at_gmail.com>
Date: Fri, 20 Feb 2009 16:33:04 -0500

On Fri, Feb 20, 2009 at 4:17 PM, Bob Archer <Bob.Archer_at_amsi.com> wrote:
> I see... so still two sides of the same coin. The commit on trunk which
> is the results of the --reintegrate creates a revision that branch needs
> to know about for further merges from trunk and/or future
> --reintegrations.
> So, lets say r100 was your commit as your example showed. I record-only
> that revision in the branch. Now I make more changes in the branch and
> never make any more changes on the commit.

The last sentence doesn't parse. I think what you were trying to say
is that suppose that r100 was just the commit of the reintegrate and
not also some other changes? Yes, that would be an important point.
If you made additional changes as part of the commit then you had
better delete and recreate the branch.

> There is still no problem
> doing a reintegrate again? Also, if I did a merge from trunk to the
> branch there is nothing to do.

Correct, you should be able to just reintegrate again or catch up with
trunk first and then reintegrate again.

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

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.