[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Merge tracking and automated merges

From: Matt Doran <matt.doran_at_papercut.com>
Date: 2007-10-16 14:54:10 CEST

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.

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.

Thanks,
Matt

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Tue Oct 16 14:54:22 2007

This is an archived mail posted to the TortoiseSVN Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.