[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: Tor Ringstad <tor.ringstad_at_tandberg.net>
Date: 2005-07-07 20:54:52 CEST

> 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?

You can certainly merge between directories that are on different
levels, this is what is done in the examples in the "Branching and
Merging" chapter in the manual. In your case, when merging, you should
just view Proj4 and Proj5 as if they were regular branches.

I.e., if you want to merge all changes on Proj5 back to Proj4, you
would cd to the root directory of Proj4 in a working copy and:

  % svn merge -r100:HEAD svn://foo.com/trunk/Proj5

This is assuming that revision 100 was the revision when Proj5 was
started.

> 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.

If you just want to merge *everything* and *once*, there's ways to
avoid having to keep track of revision numbers.

If you want to merge several times, and/or merge selectively, then you
will have to manually keep track of revision numbers at some level or
another. Subversion will offer no help.

Of course, if you always merge the relevant changes back to Proj4
immediately after committing them to Proj5, "keeping track of revision
numbers" will be as simple as remembering one number for as long as it
takes to type the merge command.

If you want better merge support, you'll have to find another tool
than Subversion, take a look at SVK, or wait until Subversion acquires
the features you need.

- Tor Ringstad -

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Jul 7 20:57:16 2005

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