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

Re: Merging and Banching (kind of) question.

From: David Weintraub <qazwart_at_gmail.com>
Date: 2005-07-08 19:27:18 CEST

On 7/7/05, William Nagel <bill@stagelogic.com> wrote:
> Ron,
> One handy trick for keeping your merge history straight is to use a
> common log format whenever you do a merge. For example, let's say
> that you wanted to merge revisions 15 to 32 of Proj4 into Proj5, like
> this:
> $ cd Proj5
> $ svn merge -r 15:32 svn://foo.com/trunk/Proj4
> When you perform the commit, use a log format something like the
> following:
> $ svn commit "Merged from Proj4 - revisions 15:32"

Subversion not tracking merges is a big missing feature.

I use properties to keep track of what was merged. I have a property
called "jcals:merged" that I place on the files and directories
involved with the merge. By looking at this property, I can see what
was most recently merged. Since properties are versioned, looking at
an older revision of the tree will show me what was merged there. I
find it a bit quicker looking for this one property instead of combing
the log for merges.

David Weintraub
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Jul 8 19:29:26 2005

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.