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

Re: Tracking svn merge

From: Bart Robinson <lomew_at_pobox.com>
Date: 2006-01-17 20:59:48 CET

On 2006-1-16 Lakshman Srilakshmanan <lakshman.srilakshmanan@tradingpost.com.au> wrote:
> Q2. What is the work around today [for tracking merges]. Is
> there a best practice to follow ? Or do we just need to keep
> a manual note and track merging revision manually.

1) The svnmerge script: There is a copy in contrib in a src
   dist and it is easily found on the net.

2) Judicious commenting: mentioning the revision range in the
   commit message, as suggested in the book (already mentioned).

3) Judicious tagging: use a tag to track the last merge point.
   This is described in the gcc svn howto:
   http://gcc.gnu.org/wiki/SvnBranch
   (other good info in their wiki)

4) Some combination of the above.

-- bart

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Jan 17 23:39:11 2006

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