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

Re: can *never* use merge with --reintegrate

From: Pat Farrell <pfarrell_at_pfarrell.com>
Date: Mon, 12 Oct 2009 11:52:05 -0400

Stein Somers wrote:
>> I can't get merge tracking to work. Even if I start with an empty
>> branch, just created and a full "svn update" done on the branch, when I
>> try the merge command, it fails.
>> svn merge --reintegrate \ https://www.pfarrell.com/repos/bbook/branches/pat
> First of all, that command shows you're in Windows and the root of the
> current drive is a working copy set to /trunk, right?

I'm in Ubuntu and yes, the current directory is

> Reintegration is a stage after "genuine" merging. First you have to merge
> /trunk into /branches/pat, commit that (which in this case will only send a
> svn:mergeinfo attribute). Then reintegration should work.

OK, so what are the steps, really. I find the RedBean on this terrible.

first: make a branch

 svn copy https://www.pfarrell.com/repos/bbook/trunk \
           https://www.pfarrell.com/repos/bbook/branches/pat \
      -m "Creating a private branch of trunk for pat."

 Second, make changes to branch and commit

Third, do something, your "merge"
I'm not seeing this, if the trunk is fixed, why do some sort of merge of
trunk into branch?

Forth: reintegrate
svn merge --reintegrate https://www.pfarrell.com/repos/bbook/branches/pat

Pat Farrell
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-10-12 17:53:11 CEST

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