[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-08 11:12:59 CET

On 11/7/07, Stefan Küng <tortoisesvn@gmail.com> wrote:
> >> 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.
> Reproduction recipe would be fine, yes. Otherwise it would be hard to
> find a bug (if there is one).

Attached is a test repository. To reproduce:

1) Checkout 'trunk' from test repo.
2) Try to merge 'branches/b1', shift-selecting both revisions from the
log dialog.
Tortoise fills 'revision range' field with '7,5' which is backwards, but,
as you said, it actually does not matter, as both '7,5' and '5,7'
seem to produce identical
bogus conflict.
The workaround is to manually enter '5-7' as a range.

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 Thu Nov 8 11:13:23 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.