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

[TSVN] Re: Re: Merge dialog

From: Simon Large <slarge_at_blazepoint.co.uk>
Date: 2005-01-24 14:38:42 CET

SteveKing wrote:
> On Mon, 24 Jan 2005 11:37:38 -0000, Simon Large
> <slarge@blazepoint.co.uk> wrote:
>> If you have a non-contiguous range (a range with gaps), you will
>> need to do the merge in several steps, which means the dry-run
>> feature will either have to be disabled, or shown as the series of
>> separate merges that it really is.
> Haven't thought about the dry-run with this. Hmm - one problem with
> multiple merges is also that if the first merge produces a conflict,
> the secone merge will fail if the conflicted file is involved.
> Maybe we should skip merging multiple ranges and just allow selecting
> one range.

I think that would be best, at least to start with.

>>> Or, the user can specify a second URL to the first one as the range.
>> Now this bit _is_ confusing. Instead of specifying a range, I am now
>> specifying a second URL. But how do I set the revision numbers for
>> the first URL and the second URL? What happens if I already selected
>> a range?
> You specify the URL@REV (as with the CL client). This would be
> explained in a tooltip.

So you can't use the show log dialog - isn't that a step back from the
current interface?


  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 Mon Jan 24 14:44:02 2005

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