On 2/7/06, Jim Hyslop <address@hidden> wrote:
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Russ Sherk wrote:
> Any ideas?
>
> On 2 Feb 2006 05:18:35 -0800, Xapp <address@hidden> wrote:
>
>>Hi,
>>
>>Currently we have 2 repo's with the same project. R_1/mod_A,
>>R_2/mod_A. For some reason, R_1/mod_A was abandoned and development
>>proceded on R_2/mod_A. R_1 is our main repo and we want to move
>>R_2/mod_a to R_1.
>>
>>I know that a project can be moved from repo to repo with the only real
>>impact being to checked out copies [1], [2]. Is it possible to move
>>R_2/mod_a to R_1/mod_a without losing history?
If R_1 and R_2 were in sync at the time R_1 was abandoned, then you will
not lose any information, since R_1 and R_2 share a common base point.
True.
Otherwise:
>> Or would it be better
>>to move the unwanted project out of the way and replace (copy) it with
>>the new one?
do this if the two projects were not in sync, and keeping the history of
R_1 is important.
After delving into the projects, it looks like they were
not in sync (R_1/mod_a was created on a branch, merged to the trunk,
exported and imported to R_2... and then they drastically
diverged.) So, seeing how R_1/mod_a is for all intents and
purposes dead code, I'll do it this way.
Except that moving files/dirs around in the repo will affect the past... I guess I'll have to add it in a new location.
Thanks for your insight.
--Russ
- --
Jim Hyslop
Dreampossible: Better software. Simply.
http://www.dreampossible.ca
Consulting * Mentoring * Training in
C/C++ * OOD * SW Development & Practices * Version Management
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2 (MingW32)
Comment: Using GnuPG with Thunderbird -
http://enigmail.mozdev.org
iD8DBQFD6OhYLdDyDwyJw+MRAnHkAKDQWLMBEN8aBuCBHgHGLTIsQxKASgCg2oJG
qQESB/sq0VSKT9TafDCBIpE=
=jXWK
-----END PGP SIGNATURE-----