git svn project shuffle

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



I have used git to interface with an svn repo for some time quite
successfully, but today I've run into a scenario that I'm not sure how
to solve.

The situation is this:
* I have a project (let's call it "oldproj") that has its own
branches, tags, and trunk svn structure
* oldproj is checked out using git svn clone --stdlayout and all has been swell
* due to a CM shuffle oldproj's svn trunk has been copied to a new svn
project (let's call it newproj), so oldproj/trunk has been copied to
newproj/trunk/oldproj
* oldproj's branches and tags directories have been "archived",
meaning it isn't CM guy's intention to bring them over to the newproj
structure.  I don't mind losing the contents of the oldproj's branches
and tags, but I'm not sure how to transition to newproj using my
already checked out git svn clone

My questions are:
# If I try to start from scratch by using git svn clone --stdlayout
the "newproj" location I lose all of the revision history associated
with "oldproj/trunk" that has been copied to newproj/trunk/oldproj.
How can I have git understand the history for the
newproj/trunk/oldproj location?

# An alternative would be if I could somehow reconfigure my already
checked out oldproj git repo so I retain all of the version history
and my local branches and can move forward checking code into the
newproj/trunk/oldproj location?

Regarding the second question, I'd be concerned that the loss of the
branches and tags from the oldproj would confuse things in the future
as the newproj branches and tags are new.

This is probably a simple scenario that many have bumped into but my
searches have so far come up blank.

Thanks very much for any guidance or pointers to previous discussions
regarding this scenario.

--
Chris
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]