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

Re: More feedback on merge wizard

From: Alexander Klenin <klenin_at_gmail.com>
Date: 2007-11-06 18:51:29 CET

On 11/7/07, Stefan Küng <tortoisesvn@gmail.com> wrote:
> > 2. Enable the Merge button on the 2nd page, so you can skip the last
> > page. But this should only happen in merge-meister mode, not for
> > normal users, otherwise they will miss the last page.
> Not sure if that's possible without rewriting the wizard control.
> Also I don't quite get the fuzz about reducing clicks in the merge
> wizard - three clicks aren't that much. And now with Alexanders hidden
> registry setting, we're down to two clicks. What's one more to get to
> the last page?

Ok, perhaps you are right. I will test more with a hidden setting on.

> >> 1) When merging a range of revisions from branch to trunk, only
> >> globally consecutive
> >> revision numbers gets translated into ranges. Correct behavior would be
> >> to make ranges from all revisions which are consecutive on the selected branch.
> >> This is a serious regression, as it essentially forces me to enter
> >> revision ranges by hand.
> >> I could take a look at fixing this, but not very soon, I am afraid.
> I'm not sure I understand you here. If you show the log dialog, select
> all revisions from the branch you want to merge, then of course there
> will be multiple revision ranges. But those get 'merged' by the svn
> library automatically anyway (it determines its own revision ranges from
> the one we pass to it, i.e. removes already merged revs, concats what it
> can and then does the merges).
> Why do you think you have to manually enter a revision range there?

Because I get conflicts otherwise.
Will try to create a reproduction recipe on a test repository tomorrow.
Form the description you gave this sounds like an SVN bug.

> Yes, this only works if the server also understands merge tracking.
> Otherwise it will merge everything (including already merged revisions,
> sorry). That's also why it's in the extended menu, not in the default
> one: it's not something an unexperienced user should use.

I was talking not about 'Merge all' command, but about
"To merge all revisions, leave the box empty" label in a standard merge wizard.
First, does it not make 'Merge all' obsolete?
I think Stefan already answered me positively,
but after seeing it still in the source I am not sure any more.
Second, the problem is not that it merges everything (that would be
but that it merges nothing -- at least in my tests.

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 Tue Nov 6 18:51:34 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.