Re: Merge tracking and automated merges

On 10/17/07, Simon Large <simon.tortoisesvn@googlemail.com> wrote:

> Maybe we could have a merge wizard (I can feel the hatred rising
> already ;-) to guide you through the common use cases, and a 'classic'
> merge which is the dialog we have now.

Or:
have an "auto merge" context menu entry anyway. But if we can't get
enough information from the merge tracking info to do the auto-merge,
we pop up the existing dialog.

> One thing to remember is that unless the server and all clients are
> 1.5, merge tracking will not work reliably, so we should not default
> to that mode.

But in that case, the auto-mode won't even work because it won't be
able to retrieve the additional information which is required for the
merge.
There's one small annoyance with this: to get the 'missing'
information for the auto-merge, the repository has to be contacted.
Which means the auto-merge could take a while until the 'advanced'
dialog shows up in case of an < 1.5 server.

Stefan

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