On Thu, Nov 6, 2008 at 10:37 PM, Hyrum K. Wright
<hyrum_wright_at_mail.utexas.edu> wrote:
> 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.
We actually had the simple syntax in 1.5 before we branched. It was
ultimately decided that we should get rid of it because it is too
ambiguous. What if you create a branch from a tag, for example? The
idea that made the most sense, but no one has implemented it yet, was
to make it do an interactive merge when you did not provide arguments.
Basically, give you some options of where to merge from and let you
select.
Several of the GUI clients for 1.5 automatically fill-in the URL to
merge from using the copy source information. You can still change
it, but do not need to.
--
Thanks
Mark Phippard
http://markphip.blogspot.com/
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-11-07 14:06:35 CET