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

RE: Calculating result (merge) of multiple revisions

From: Daniel Becroft <Daniel.Becroft_at_supercorp.com.au>
Date: Wed, 16 Jan 2008 08:52:06 +1000

> -----Original Message-----
> From: John Peacock [mailto:john.peacock_at_havurah-software.org]

> Daniel Becroft wrote:
> > This seems like alot of work, so hence the reason I am
> asking if there
> > is something already built into subversion, or if someone
> has already
> > written something to do this.
> It's not a lot of work if you install Trac (or some other
> equivalent tool) and
> use a pre-commit hook to check for a ticket number. Then you
> helpfully have a
> single ticket with all of the associated changesets listed,
> for easy(?) merging
> later.

Thanks, John.

I've already integrated our change management system to the SVN
repository via the pre- and post-commit hooks, so we already have
the 'ticket' and the associated changesets. I was after the 'merging later'
portion of your solution.
> 1.5 (whenever *that* comes out) will automate the merging
> aspect, and you can
> get most of that functionality now with svnmerge.py today.

I'm sorry, but maybe I misworded my question. I am recording each
revision that has been committed against the devel branch for version X against
the appropriate 'ticket' (as above). However, in addition to displaying these
revisions (and the changesets for each), we also want to display a single list of
the overall changes that have been made, ie the net result of the changeset set.

I don't actually want to be merging and then committing back to the repository.

> But if you have
> multiple tracks of development (trunk, more than one branch
> you release from),
> you really want to have a tool that helps manage that
> information. Subversion
> isn't that tool; something like trac might be...

All the revisions that I care about will be made on the same branch, so I'm not sure
if that makes it easier or not.

Daniel B.

To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-01-15 23:54:55 CET

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

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