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

Re: Merge tracking tool for 1.4.x branch

From: Greg Hudson <ghudson_at_MIT.EDU>
Date: 2006-03-01 22:46:28 CET

On Wed, 2006-03-01 at 11:38 -0800, Blair Zajac wrote:
> 1) Lists the revisions merged over. Can you easily tell me all the revisions
> merged into 1.3.x?

Yes, by reading the svn log data. (No, that's not programmatic or
robust, but it's good enough for writing the CHANGES update for a
release, which is the only reason I can think of why we'd need this
information.)

> 2) Get a list of revisions that haven't been merged over yet.

We definitely never need this information. The revisions that haven't
been merged over yet is "most of them."

> 3) Makes mistakes less likely. You don't have to worry about merging over a
> revision you already merged over.

We've never made such a mistake that I know of.

> 4) Generates a log message for 'svn commit -F' with the log messages that are
> being merged over. So you can easily see in the merged log message what was
> written about the original revision.

That's potentially interesting. Not sure if people would want to make
our logs that verbose, though.

> 5) Block particular revisions from ever being merged over. If there are one or
> more revisions you definitely never want merged over, you can mark them as such.

We don't need to do that.

> 6) Handles multiple revisions easily:

That's also potentially interesting.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Mar 1 22:47:45 2006

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