Re: svnmerge.py

On Wed, Aug 16, 2006 at 10:59:23PM +0200, Chris.Fouts@qimonda.com wrote:
> Sorry if this is OT for this mailing list.
>
> Can this tool merge changes from branch
> to trunk? I was able to merge from trunk
> to branch, but can't figure how to merge
> the other way around.

svnmerge.py's help should tell you. The -S option is what you want.

[in trunk working directory]
svnmerge.py merge -S branch_name

You'll "svnmerge.py init" run on the trunk beforehand, of course ...

Thanks,
        Jamie
>
> --------------------------------------
> Chris T Fouts
> Qimonda NA
> 3000 CentreGreen Way
> Cary, NC 27513
> Phone: (919)677-3016
> Fax: (919)678-1929
> Email: chris.fouts@qimonda.com
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: users-help@subversion.tigris.org
>
>

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Aug 16 23:30:24 2006