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

Re: Why is --reintegrate needed for svn 1.5 merging?

From: Mark Phippard <markphip_at_gmail.com>
Date: Fri, 30 May 2008 12:40:10 -0400

On Fri, May 30, 2008 at 12:35 PM, Kylo Ginsberg <kylo.ginsberg_at_gmail.com> wrote:
> Very helpful question and answer -- thanks. So, a followup question
> to solidify my understanding:
> Background: we are currently running 1.4. We follow svnbook's basic
> recommended practices, performing weekly syncs of trunk->feature
> branch. In addition, we sometimes find that a particular revision,
> Nf, on a feature branch is of some use on trunk. We thus do a simple
> merge of just Nf to trunk, creating revision Nt, and all is well.
> However, the next time (e.g. weekly) that we want to re-sync the
> feature branch with trunk, we want to skip the revision in question
> since the feature branch already has it. One way to accomplish this
> with 1.4 is to merge down the week's range and manually resolve
> conflicts; another method is to merge two revision ranges, carefully
> skipping Nt.
> With 1.5, will a 1.5-style re-sync (i.e. no revision range specified)
> cleanly skip Nt, knowing that the feature branch already has this (as
> revision Nf)?

No, it will not know to skip that revision.

> or is special care to skip the revision still required?

You could use the --record-only option on the branch so that it thinks
it has that revision from trunk already. That would keep you from
having to constantly remember to do something special.

In many cases, if it attempts to merge back that revision it is not as
bad as it seems like it might be. What might happen is you might see
a "notification" that it attempted to merge to that file, but then
when merge is done and you look at the status there will not be any
changes. Basically, I think what happens is when merge goes to merge
the changes, if it sees the exact changes in place it does not
re-merge them. I am not entirely certain when this happens and when
it does not happen.

> And back to the OP's topic, will a subsequent merge-back just pass
> --reintegrate as per normal?


Mark Phippard
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-05-30 18:40:34 CEST

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.