Re: Problem with tortoise merge dialog

On 15/01/2008, Jon Hardcastle <jd_hardcastle_at_yahoo.com> wrote:
> --- Simon Large <simon.tortoisesvn_at_googlemail.com>
> wrote:
> > 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).
> >
>
> *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!

Sorry, but no. The old way is gone, and for good reason. SVN 1.5
introduces merge tracking, and more EOL and whitespace handling
options. The old dialog would have become impossibly complex for many
users.

Merging has always been a source of confusion to newbies and we hope
the new dialog will make the process easier. It is also easier for old
hands to in some ways because you can merge multiple revision ranges
in one hit, either by specifying the rev numbers, or by selecting from
the log dialog.

I appreciate this is not ideal for your training schedule, but when
merge tracking comes in with SVN 1.5 I think you will have to do some
more training anyway.

Try a nightly build (with all the usual caveats about your working
copies being upgraded irreversibly ... ) and see what you think.

Simon

-- 
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.net
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org