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

Re: [TSVN] Re: TortoiseSVN Issue: Merge dialog decrements selected Fromrevision

From: Simon Large <simon_at_skirridsystems.co.uk>
Date: 2005-09-09 22:35:25 CEST

Tobin Bergen-Hill wrote:
> Stefan Küng wrote:
>
>> Simon Large wrote:
>>
>>> I have been wondering about this as it seems to come up quite often
>>> now, in the specific case of merging changes from the start of a
>>> branch. Is it possible to determine from the show log dialog whether
>>> the earlier revision is a copy-from? If it is, then you cannot do
>>> rev-1 because it didn't exist.
>>
>> I haven't tested this recently, but wasn't this fixed in 1.2.2?
>
> I installed 1.2.2 and tried selecting the copy-from revision in the show
> log dialog (and multiply selecting the revisions from commits on that
> branch after its creation). When I hit OK, the Merge dialog shows
> (copy-from rev) - 1 as the From revision.

Stefan has already explained that this behaviour is intentional. The
"wasn't this fixed" comment referred to my query, not yours.

If you include the revision where the branch was created, then yes, you
do get (copy-from-rev) - 1, but unless I am much mistaken, the merge
works perfectly. That's because the revision before the copy is
identical to the revision after the copy - copies do tend to be
identical ;-)

Simon

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Fri Sep 9 22:35:13 2005

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