From: Christopher Snapp <snappca@gmail.com>
To: git@vger.kernel.org
Subject: git svn project shuffle
Date: Mon, 4 Oct 2010 14:36:36 -0400 [thread overview]
Message-ID: <AANLkTimL18WHOrLjA5iWNcsgd6H8Eeq19LfJNjkKu_b-@mail.gmail.com> (raw)
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
next reply other threads:[~2010-10-04 18:36 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-04 18:36 Christopher Snapp [this message]
2010-10-04 18:54 ` git svn project shuffle Jonathan Nieder
2010-10-13 13:41 ` Christopher Snapp
2010-10-15 16:48 ` Jonathan Nieder
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=AANLkTimL18WHOrLjA5iWNcsgd6H8Eeq19LfJNjkKu_b-@mail.gmail.com \
--to=snappca@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).