Re: Merge tracking and automated merges

On 10/17/07, Matt Doran <matt.doran@papercut.com> wrote:
> Hi Stefan,
> >
> > The merge tracking is in use even with the merge dialog we have now:
> > you can specify the revision range HEAD-WorkingCopy - that's exactly
> > what 'svn merge -g' does.
> >
> >
> I revisited this, but I'm not sure what you mean by the above. Is there
> a way with the existing merge dialog for me to automatically merge all
> "unmerged" revisions. If so what settings do I use?

you used
$ cd /branches/mybranch
$ svn merge -g

to do the same with TSVN:
* right-click on /branches/mybranch
* choose "merge"
* 'from' url: url/of/trunk
  'to' url same as from url
  from-revision: "WC"
  to-revision: HEAD

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