Re: Merge Tracking (was: Regression: Branch from working copy with modified files)

Norbert Unterberg wrote:

> I did not follow the merge tracking development in SVN or TSVN.
> What did or will change with the merge tracking implementation in the
> SVN 1.5 line? I realize that merge tracking keeps track of merges by
> updating a new svn:merge (or similar name) property. But how would
> this influence the TSVN GUI or the merging procedure in general?

Well, a *lot* has changed under the hood. But you won't see much of it
in the TSVN UI. The main part is really done in the Subversion library
and handled transparently (which is IMHO very good).

> Would we see an improved merge (or merge dialog), or would this be
> just more intelligence in the background?

I'm not sure yet. The merge dialog will change at least slightly. We
need to add another button (or maybe implement a 'multi-button') besides
the 'merge' and 'dry-run' button (btw: shouldn't we rename that button
from 'dry-run' to 'test run'?). Subversion now can do something in
between those two: do a dry-run, but still record the merge (i.e. do the
merge *tracking* without actually do the merge) - that is useful if you
want to add the tracking info to existing projects which don't have the
previous merges tracked.

Since the merge info is tracked in properties, we could maybe add
something to the merge dialog which would show that merge tracking info.
But I'm not sure how that will really benefit the user.

> Can you point me into some direction (old threads on this list, or svn
> documents) where I can read more about how merge tracking is supposed
> to work in the future, from a user's point of view?

Not sure if that's what you need:
http://subversion.tigris.org/merge-tracking/
It's not really from a user's point of view, but it might help for now.
We don't have our docs updated yet :)

Stefan

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