Jamie Wellnitz wrote:
> On Thu, Aug 17, 2006 at 03:24:16PM +0200, Chris.Fouts@qimonda.com wrote:
>>
>>> -----Original Message-----
>>> From: Blair Zajac [mailto:blair@orcaware.com]
>>> Sent: Wednesday, August 16, 2006 5:52 PM
>>> To: Fouts Christopher (QNA RTP PT PREV)
>>> Cc: Jamie.Wellnitz@emulex.com; users@subversion.tigris.org
>>> Subject: Re: svnmerge.py
>>>
>>> Chris.Fouts@qimonda.com wrote:
>>>> I get...
>>>> svnmerge: no integration info available for repository path
>>>> "/branches/cf"
>>>>
>>>> Here's what I did.
>>>> Merge from trunk to branch
>>>>> cd to branch top dir
>>>>> svnmerge init
>>>>> svnmerge merge (merged from trunk)
>>>>> svn commit
>>>>> (Modify branch file)
>>>>> svn commit
>>>> Merge from branch to trunk
>>>>> cd to trunk top dir
>>>>> svnmerge init /myrepos/trunk
>>> You're telling init to merge changes from trunk back to itself.
>>>
>>> You need to tell it to merge from the branch and you'll need
>>> the -r command line option to tell it which revisions have
>>> "already been merged over". Here, you'll want to use 1-N,
>>> where N is the revision that the branch was created at.
>>>
>>> You should revert the commits in your trunk with the svnmerge
>>> init command.
>>>
>>> Also, before committing, I suggest doing a diff to see exactly
>>> what changes svnmerge.py is making to your . directory and see
>>> if it makes sense.
>>>
>>> Regards,
>>> Blair
>>>
>> I was under the impression svnmerge helped rid the need for
>> revision numbers. Oh well...
>
> In simple cases svnmerge.py can hide the revision numbers. If you
> have a fairly simple merge problem:
>
> /-----+------+-----+--------> branch
> / \ \ \
> ----+---------*------*-----*------> trunk
>
> If you run "svnmerge.py init -S branch" on the trunk (and commit the
> change) just after creating the branch (wich "svn copy"), each of the
> periodic branch -> trunk merges shown should just be:
Also, this won't work, "svnmerge.py init branch" because svnmerge.py will assume
that revisions 1-HEAD have already been merged from the branch to the trunk and
set the svnmerge:integrated property to be 1:HEAD, whatever revision HEAD is.
In this case, you also need to supply the -r command line option to pick the
revision when the branch was created, and pass -r 1:N as that.
Regards,
Blair
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Aug 17 19:38:19 2006