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

Re: [TSVN] Re: Merge dialog

From: SteveKing <stefankueng_at_gmail.com>
Date: 2005-01-24 13:22:46 CET

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 the list of revisions should be in an edit box rather than plain
> text. Ideally, the user should be able to enter that information
> manually, so if I _know_ I need to merge r2497 then I don't want to
> waste time with ShowLog. But that means you need to syntax-check the
> range information. If you don't want to do that, then a read-only edit
> box at least allows the range to scroll if it is bigger than the
> allocated space.

An edit box is ok.

> > 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.

> One CLI feature we don't support at all is --ignore-ancestry. Is that
> important?

--ignore-ancestry doesn't really change the result of a merge. All it
does is (maybe) speed up the merge process if you _know_ that you're
merging completely unrelated files.

Stefan

-- 
       ___
  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 13:24:15 2005

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