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

Re: Merge tracking feature request

From: Simon Large <simon.tortoisesvn_at_googlemail.com>
Date: Wed, 18 Jun 2008 17:40:14 +0100

2008/6/18 Robert Dailey <rcdailey_at_gmail.com>:
> On Wed, Jun 18, 2008 at 11:12 AM, Stefan Kng <tortoisesvn_at_gmail.com> wrote:
>>
>> Robert Dailey wrote:
>>>
>>> Hi,
>>>
>>> I noticed when I create a feature branch, there is no default
>>> svn:mergeinfo set. For example, if my trunk is at revision 100, and I create
>>> my feature branch from that revision, the default property for my working
>>> branch root should be:
>>>
>>> /trunk:0-100
>>>
>>> on my new feature branch. Why is this not the case? This would be
>>> extremely helpful, as I won't have to remember in my head (or have to put it
>>> in my branch log) which revision I branched from. Would this be a difficult
>>> feature to add?
>>
>> To get the revision from where you branched, use the log dialog. There's a
>> checkbox "stop on copy". If enabled, the log will stop at the point where
>> you created the branch.
>
> You're saying to "show log" on my branch or on trunk? I'm assuming you mean
> the branch. This does work, but it doesn't help me in the merge dialog,
> because the "Show log" button in the merge dialog shows the log of the
> branch I'm merging FROM, which is the trunk. And from that location, you
> cannot tell where you branched from.

There is another ShowLog button for the merge WC for exactly this
purpose. Or at least there was one there in 1.4.8 and I think it was
carried across to 1.5.0

Simon

-- 
: ___
: oo // \\ "De Chelonian Mobile"
: (_,\/ \_/ \ TortoiseSVN
: \ \_/_\_/> The coolest Interface to (Sub)Version Control
: /_/ \_\ http://tortoisesvn.net
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: dev-help_at_tortoisesvn.tigris.org
Received on 2008-06-18 18:40:23 CEST

This is an archived mail posted to the TortoiseSVN Dev mailing list.