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

Merge links

From: Toby Johnson <toby_at_etjohnson.us>
Date: 2006-05-23 19:47:57 CEST

Has anyone ever discussed or thought of a way to put a specially-crafted
string into the commit message of a merge, so that users can
subsequently easily get to the "source" of that merge? (Much like how
the bugtraq links currently work).

Say someone uses TSVN to merge r123:456 of http://foo.com/svn/branch to
http://foo.com/svn/trunk. As part of that commit message, TSVN
automatically appends the following text:
"TSVN-Merge:http://foo.com/svn/branch:r123:456"

That way, when viewing the log of trunk, and that revision is selected,
TSVN could recognize the fact that this trunk revision was a merge from
branch and present a button to easily bring up the log (or repo-browser)
for that point in time on the branch. This would be especially helpful
if the branch has subsequently been deleted.

Of course the difficult part would be storing the details of the merge
between when the merge took place and when it was committed. It could
also just be an optional manual entry in the commit dialog (with fields
for start and end URLs / revs), or perhaps the merge action could insert
the appropriate string into the "recent commit messages" list.

Just a thought. Until SVN has "true" merge tracking, getting to the
source of the merge can be unintuitive for non-technical users who are
just trying to figure out when something changed.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Tue May 23 19:47:23 2006

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.