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

Better way to merge?

From: Jon Drukman <jdrukman_at_gmail.com>
Date: Thu, 18 Sep 2008 11:12:02 -0700

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

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.


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-18 20:15:46 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.