Matt Doran wrote:
> Hi there,
>
> I use TSVN daily ... and love it! Now that 1.5 is approaching I wanted
> to investigate the merge-tracking features. It's the last big feature
> missing from svn, and I'm looking forward to the 1.5 release.
>
> For me the killer feature with merge tracking is automate the repeated
> merging of trunk to a feature branch. If I understand things correctly,
> with the 1.5 command line client you can merge any pending changes
> simply by doing something like this:
>
> > cd feature-branch-wc
> > svn merge -g url-to-trunk
>
> You don't need to specify revision ranges, etc ... it just figures out
> which revision ranges need to be merged. It believe will even merge
> non-contiguous revision ranges.
That's ok if you're working on a branch which you sometime later want to
merge back to the trunk.
But if you have a branch you use as a release branch, then that wouldn't
be a good idea because there you only want to merge very specific revisions.
> I've downloaded and installed a recent TSVN nightly build to play with
> the merge tracking features. The new "merge-tracking" features in the
> log dialog and blame are good, but it doesn't seem like merge has
> changed much in this area. You still need to specify the from/to URL
> and revision ranges, etc. Will TSVN support this new style of
> automated merging in some form? (I'm sorry if this is still under
> development .... or if this has been asked before but I couldn't find it
> in the archives or the nightly documentation).
>
> I understand that you will still need to have the ability to do the
> manual merge with all the options ... but I think providing this
> new-style merge is important to get the most of merge tracking.
Do you have an idea on how we should implement this (UI wise)?
I thought of an extra context menu entry "Auto merge", but then: what
happens if the user accidentally clicks on it? Or think of most users
who are not familiar with merging - they will always choose "Auto merge"
instead of "Manual merge", which means they would always get wrong
results for e.g. a release branch.
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.
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
Received on Tue Oct 16 18:47:05 2007