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

Merge tracking feature

From: Nicklas Norling <exinor_at_exinor.net>
Date: 2005-11-01 14:19:10 CET

Hi!

My dream is some form of merge tracking for svn. It's such a pain to
remember
what's merged and what's not. I always get into troubles sooner or later.

There is a rather simplistic solution to this that involves using meta
data to
track what's merged and what's not. Much like tsvn: properties that's used
for bug tracking. It's implemented client side in svnmerge.py/sh.
http://svn.collab.net/viewcvs/svn/trunk/contrib/client-side/
(Search from the bottom of the page)

Guessing that python bindlings and the C API is somewhat similar this might
not be all that much work to do? The major parts being UI and figuring out
how this would be used by end users.
Since merge tracking in svn seems a long way away atm. (there isn't a design
proposal yet) I guess TSVN could get some cheap points supporting what
svnmerge already does.

The current interface supports three methods:
init - Turn svnmerge tracking on for a path
avail - What's available for merging
merge - Merge these and track that they have been merged

svnmerge.sh has a usage printout that gives a good idea about what the
command line UI provides. svnmerge.py adds ability to block some
revisions from being merged and appears to be the latest and in active
development.

What do you think?

-- 
JID nicke@im.exinor.net
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Tue Nov 1 14:19:38 2005

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

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