[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: How to merge two repositories with out loss of log & tags ?
From: |
Eric Siegerman |
Subject: |
Re: How to merge two repositories with out loss of log & tags ? |
Date: |
Fri, 22 Nov 2002 12:46:27 -0500 |
User-agent: |
Mutt/1.2.5i |
On Fri, Nov 22, 2002 at 10:10:48AM +0530, Srinivas P Shenoy wrote:
> CVS/project which is a super set of project1 & project2.
I think you mean that the two old projects were independent of
each other, containing different files; and the new super-project
is to contain all of them (files from p1 + files from p2),
something like:
<repository>/
project/
old-project-1/
old-project-2/
Is that right?
If so, just copy the ,v files from the two old repositories into
a new repository, in the tree structure you want to end up with.
("Copy" instead of "move", so that you still have the old repo's
as backups :-)
But if, instead, the two old repositories are variants of the
same original code base -- i.e. each one contains different
revision histories for the same files, so that what you want to
do is, for each file, merge its two revision and tag histories --
that'll be a challenge, to put it mildly... The best bet in that
case would probably be to:
- import the current versions from project2 into project1,
losing the version and tag history
- do the obvious merge
- keep the old project2 repository around for reference, but
make it read-only so that people can't accidentally commit
changes to it
--
| | /\
|-_|/ > Eric Siegerman, Toronto, Ont. address@hidden
| | /
Just Say No to the "faceless cannonfodder" stereotype.
- http://www.ainurin.net/ (an Orc site)