[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: William Nagel <bill_at_stagelogic.com>
Date: 2005-07-08 00:54:31 CEST

Ron,

As several others have said already, you will need to keep track of
the revisions that you have already merged because Subversion does
not yet do that for you.

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"

Then, when you go to do a merge later you can easily grep your svn
log to see what merges have already been done from Proj4:

$ svn log | grep "^Merged from Proj4"

-Bill

On Jul 7, 2005, at 12:26 PM, Ron Gilbert wrote:

> (posted this to dev by mistake the first time)
>
> I have a repository that has four projects (Proj1, Proj2, Proj3 and
> Proj4) and I want to create a fifth project (Proj5) that is a copy
> of Proj4. Most of the work will be done on the new Proj5, but over
> time I will need to merge all the relevant changes back to Proj4,
> because it will need to be kept up-to-date. Very little work will
> happen on Proj4 independent of Proj5.
>
> All the examples for creating copies and merging happen in release
> versions that sit at the same level as trunk, which is not what I
> need, so I am unclear if I can just copy Proj4 to Proj5 and then
> use merge?
>
> If so, what would the merge command look like?
>
> Proj4> svn merge svn://foo.com/trunk/Proj5
>
> But I'm missing revision numbers. I don't want to have to keep
> track of revision numbers, I just want to merge Proj5 with Proj4.
> Is this the best way to handle the situation? The more I look at
> it, the more I wonder if I am thinking about this correctly.
>
> I could just copy the files and add them as Proj5, but then I loose
> the history for Proj5, or I could rename Proj4 to Proj5 and add the
> files to a new Proj4. Seems sloppy.
>
> Thanks, Ron
>
>
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: users-help@subversion.tigris.org
>
>

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Jul 8 00:56:28 2005

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