[Svnmerge] Initializing New Branches - Already Initialized?
dlr at collab.net
Mon Jan 8 13:49:49 PST 2007
On Mon, 08 Jan 2007, Thomas F. O'Connell wrote:
> On Jan 4, 2007, at 3:04 PM, Daniel Rall wrote:
> >On Thu, 04 Jan 2007, Thomas F. O'Connell wrote:
> >>Whenever I create a new branch, e.g.,
> >>cd working-copy-top-dir
> >>svn copy trunk branches/new-branch-n
> >>And then try to initialize the branch, e.g.,
> >>cd branches/new-branch-n
> >>svnmerge.py init
> >>I get the following error:
> >>svnmerge: /vhost/trunk has already been initialized at .
> >>Use --force to re-initialize
> >>Am I missing something? Why would brand new branches already be
> >Does trunk already have the svnmerge-integrated property set on it
> >before you create the branch (via 'svn cp')?
> Apparently. In trunk:
> svn proplist .
> Properties on '.':
> Is this ill-advised? What should I do to correct it?
Well, you can't re-initialize a branch directory. If you no longer
need the record of merges which have occurred into your trunk, you can
delete the merge info via:
svn propdel svnmerge-integrated
BEWARE: This will LOSE ALL MERGE HISTORY for merges into trunk.
Alternately, you can use 'svnmerge.py merge --record-only' (or just
'svn propedit') to explicitly mark all revisions from trunk as merged
into your new branch (which is probably closer to what you're looking
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Size: 189 bytes
Desc: not available
More information about the Svnmerge