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

Viewing branch details after a merge

From: Toby Johnson <toby_at_etjohnson.us>
Date: 2005-10-18 22:45:27 CEST

I wanted to bounce an idea off the list for how TSVN might help make
Subversion's current lack of merge tracking a bit easier to work with.
When a merge is performed using TSVN, two revprops could be created when
that merge is committed, say "tsvn:merge-from" and "tsvn:merge-to".

Then, when viewing the log history for an item, any revision which had
these revprops could have a plus-sign next to it where the user could
"drill down" and view the change history for those "child" revisions
which were applied to that "parent" merge revision.

The problems I see with this are:

* Revprops have to be attached after a commit is made, so TSVN would
have to somehow keep track of this info and apply it after the merge is
actually committed. I don't know if there's any area in the .svn
directory where other tools are "allowed" to store info like this.

* Users might apply multiple merges in one commit, making two revprops
inadequate. Perhaps another alternative is something like
"tsvn:merge-ancestors", which is a comprehensive, newline-separated list
of revision numbers which were merged into that revision.

To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Tue Oct 18 22:46:01 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.