>-----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...
-chris
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Aug 17 15:26:08 2006