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

Re: Re: Merge dialog

From: Alexander Klenin <klenin_at_gmail.com>
Date: 2007-10-19 04:25:47 CEST

>The revision range is in svn -c style (rather than -r) and can be a
>list of revisions and ranges. Use the Show Log for URL dialog as an
>alternative means of populating this box.
Or perhaps bite the bullet and insert a log list control here,
with some kind of multi-selection?
I am afraid displaying revision range as list of numbers would be next to
useless for complex merges.
Does 1.5 allow multiple sources in the single merge in addition to
multiple ranges from the same source?

>> - page 1 would be used to select the merge style
>> A. merge all changes from branch origin
>> (this is the 'automerge', or 'svn merge -g' option)

On 10/19/07, Simon Large <simon.tortoisesvn@googlemail.com> wrote:
>If the auto merge box is checked, the other controls are greyed out,
>but there should be a big fat warning somewhere (tooltip?) that this
>will be *very* slow on a pre-1.5 server. It would be useful to
>remember the state of this checkbox on a per-repository basis.

I have not looked to SVN API upon which this command is based,
but is it possible to get a revision ranges / sources without
performing the merge itself?
If so, I think it would be the best way, as it gives user a chance
to preview and understand what will happen.

> No need for the 'Use from URL' checkbox any more.
> Merge tracking doesn't work for 3-way merge, so no need for any of
> that here either.
While I personally rarely, if ever, use it, it is still a valid action.

> I don't like the "From:" and "To" names because they appear to be the
> wrong way round,
"Last revision/first revision"?

> This doesn't reduce merging to idiot level single steps, but I don't
> think that will ever be possible.

Most of TortoiseSVN users are developers, so I think we can safely
target at above-idiot level ;-)

Alexander S. Klenin
Insight Experts Ltd.
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Fri Oct 19 04:26:00 2007

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.