[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:09:58 -0500

On Fri, Feb 20, 2009 at 4:06 PM, Bob Archer <Bob.Archer_at_amsi.com> wrote:
> I'll try my hand at writing something for the manual. Just want to make
> sure I fully understand this.
>
> So, the problem was never with running --reintegrate multiple times, it
> was doing a merge back into the branch from trunk? Branch would see r100
> (for example) as needing to be merged back into the branch which already
> contained all/a lot of those diffs?

There are two potential problems.

1) You want to catch up with trunk again. Before you reintegrated you
were doing:

svn merge ^/trunk

If you do that again, it is going to merge back the revision you reintegrated.

2) Suppose you just have made a few more changes and want to
reintegrate those to branch.

Well, internally, reintegrate figures the last revision from trunk
that you synched to that branch (or created it from). If you just
reintegrate again, then it will find the same revision it did the
first time you used reintegrate. When it uses this revision to diff
trunk at that revision and the current state of the branch, then the
diff will include all of the changes from the first reintegrate.

So doing svn merge --record-only fixes both of these problems.

-- 
Thanks
Mark Phippard
http://markphip.blogspot.com/
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=1200534
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-02-20 22:10:50 CET

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