[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: Stein Somers <ssomers_at_opnet.com>
Date: Mon, 12 Oct 2009 17:47:25 +0200

> 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?

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.

-- 
Stein
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2406709
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-10-12 17:48:25 CEST

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