Re: Noob question: New merging system in the nightly build: How to?

Robert Dailey wrote:
> Hi,
>
> I did a little bit of googling around and I was unable to find any
> updated documentation or unofficial documentation on how to use the
> new merging and branching system in the TSVN nightly build (1.4.99).
> Anyone know of some text I can read to learn about the new features?
> Supposedly I'm supposed to be able to create a feature branch, modify
> changes to it, and be able to (every day) merge in trunk changes
> little by little WITHOUT having to worry about the last trunk revision
> I merged in (which 1.4.5 doesn't do). Any help is greatly appreciated.

The new merge features are not (yet) fully implemented in TSVN. But
we're working on that :)
Most of the new features already work, but you should be aware that you
will be using a nightly build which *will* have bugs! Especially right
now since I updated to the latest SVN trunk yesterday, and a lot of the
APIs changed which means TSVN hasn't fully caught up with those.
Another thing to consider: we changed the merge dialog completely last
week, so expect some bugs in there too.

If you want to read about the new merging features of Subversion, you
could read the SVN blog at collab.net which has some articles about that
(for the command line client and Subclipse, but the merge tracking
features are basically the same in TSVN):

http://blogs.open.collab.net/svn/
http://blogs.open.collab.net/svn/2007/09/what-subversion.html

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