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

Re: svn merge "autodiscover" parent branch?

From: Hyrum K. Wright <hyrum_wright_at_mail.utexas.edu>
Date: Thu, 06 Nov 2008 21:37:14 -0600

Joe Bell wrote:
> This might be a nitpick, but it would be nice if when working on a
> branch I can rebase to the parent branch without typing in a long URL.
> For example:
>
> svn copy https://hostname/svn/project/trunk
> https://hostname/svn/project/branches/whizbang-feature
>
> svn co https://hostname/svn/project/branches/whizbang-feature
>
> cd whizbang-feature
>
> # Do some work
>
> svn merge # Look, no arguments!
>
> and have Subversion realize that no arguments means to go back in the
> history of my branch and find my parent (who I was copied from) and do a
> merge. At the moment I have to type:
>
> svn merge https://hostname/svn/project/trunk
>
> More typing, more chances to hit the wrong key and have to do it again J
>
> Is anyone aware of this as a current feature request or did I miss
> something in the merge helptext?

It doesn't solve your particular problem, but Subversion 1.6 will support
relative syntax on the command line. So your merges will look like:

svn merge ^/trunk

Not quite as magic as autofinding the merge source, but a whole lot cleaner than
before.

-Hyrum

Received on 2008-11-07 04:37:48 CET

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.