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

Re: Merge - Show Log - Revision numbers - confusion

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Tue, 01 Jul 2008 21:30:45 +0200

jdege_at_korterra.com wrote:
> On Jul 1, 4:39 am, "Simon Large" <simon.tortoise..._at_googlemail.com>
> wrote:
>> 2008/6/30 jd..._at_korterra.com <jd..._at_jdege.visi.com>:
>>
>> BTW the merge dialog has been rewritten completely in 1.5. You may (or
>> may not) find it more intuitive.
>
> And I just finished writing up the merging section of our processes
> manual describing how to use the old interface. Most of which will
> have been rendered obsolete by the merge-tracking functionality in
> 1.5 ;)
>
> I look forward to seeing it.
>
>>> (Also, has anyone noticed that the "Stop on copy/rename" checkbox is
>>> broken? Once it's checked, unchecking it or rechecking has no
>>> effect.)
>> Is that still broken in 1.5?
>
> Don't know. Just got the update notice this morning. In a multi-
> programmer shop, it takes a bit of conversation before we make a
> change, particularly when it needs a server-side change.

If you don't use file:/// to access your repository, then you don't have
to update your server. Only if you want the merge tracking feature to
work, *then* you must update your server too. Otherwise an 1.5 client
can work with older servers without any problems.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net

Received on 2008-07-01 21:31:13 CEST

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