[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

RE: Better way to merge?

From: Roth, Pierre <pierre.roth_at_covidien.com>
Date: Fri, 19 Sep 2008 07:45:47 +0100

> I have a simple project with one branch. I want to bring
> changes from the head into the branch's 'tools' directory.
> So far the only way I've found to do it is with this
> unwieldly set of commands:
> cd $BRANCH_DIR/tools
> svn log --stop-on-copy
> (find the revision where the branch took place from this command.)
> now run this:
> svn merge -r2572:HEAD
> http://svn.myproject.com/myproject/myframework/docroot/tools
> is this seriously the only way to do it? i could write a
> script but it seems weird to me that such a clumsy procedure
> is necessary. svn is usually so elegant, otherwise.
If your svn version is <= 1.4.6, you can use svnmerge.py (or
svnmerge.exe on Windows platforms) which is as elegant as you're used to
with svn command line. (http://www.orcaware.com/svn/wiki/Svnmerge.py)

To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-09-19 08:47:11 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.