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

Re: Problem with tortoise merge dialog

From: Jon Hardcastle <jd_hardcastle_at_yahoo.com>
Date: Tue, 15 Jan 2008 12:26:59 +0000 (GMT)

--- Simon Large <simon.tortoisesvn_at_googlemail.com>

> On 15/01/2008, Kai Hofmann <powerstat_at_web.de> wrote:
> > Hello,
> >
> > I have a problem with the tortoise merge dialog.
> > For this I attached a png screenshot.
> >
> > The problem is that within the "From" area I can
> choose a revision with the "Show log" button,
> > but this revision is NOT put into the revision
> field (of "from area") - its put into the revision
> field of the "To" area.
> > In the "From" area the choosen revision number -1
> will be placed. This happens also when there is NO
> such rev number within the active trunk/branch - so
> it is a VERY BAD idea, which makes the "show log"
> button nearly useless!
> >
> > In my opinion the choosen revision should be
> placed in the "From" area.
> > And then within the "To" area the "Show log"
> button should be enabled - so that I could choose
> from the history log there too. It should be made
> save that "from.revision < to.revision".
> >
> > Disabling the "show log" button in the "to" area
> is a bad idea. (Its only enabled when I enable the
> url field here too).
> >
> > Hopefully this can and will be fixed soon, because
> it confuses all newbees I have teached in the past
> years.
> The dialog works just as the manual describes it,
> IOW you can use the
> log dialog to select the range of revisions, thus
> setting both To: and
> From: values.
> But further discussion of this dialog is pointless
> because it has been
> replaced with a merge wizard on the trunk build. Try
> a nightly build
> to see what the new one looks like (but don't use
> the nightly on any
> working copies that you want to use with existing
> 1.4.x subversion
> clients - the WC will be upgraded to SVN 1.5 format
> which is
> incompatible with 1.4 format).
> Simon

*replaced* you say? No option to do it the other 'old'
way? I am gearing up to training ~30 colleagues on the
merge process. I am not over joyed with it being
changed shortly after having completed that... I
welcome these things.. but others are set in their ways!

N: Jon Hardcastle
E: Jon_at_eHardcastle.com
'The writing is on the wall...'

To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org
Received on 2008-01-15 13:27:11 CET

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

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