From: Florian Achleitner <florian.achleitner.2.6.31@gmail.com>
To: git@vger.kernel.org
Cc: David Michael Barr <davidbarr@google.com>,
Jonathan Nieder <jrnieder@gmail.com>,
Andrew Sayers <andrew-git@pileofstuff.org>
Subject: GSOC remote-svn: branch detection
Date: Fri, 03 Aug 2012 11:43:30 +0200 [thread overview]
Message-ID: <12682331.q6WHVv9EKU@flomedio> (raw)
Hi!
I'm playing around in vcs-svn/ to start a framework for detecting and
processing branches in svndumps. So I wanted to let you know about my ideas.
Two approaches:
1. Import linearly and split later:
One idea is to import from svn linearly, i.e. one revision on top of it's
predecessor, like now, and detect and split branches afterwards. The svn
metadata is stored in git notes, so the required information would be
available.
+ allows recovery, because the linear history is always here.
+ it's easier to peek around in the git history than in the svn dump during
import to do the branch detection.
- requires creation of new commits in the branch detection stage.
- this results in double commits and awkward history, linear vs. branched.
2. Split during import:
Detect branches as they are created while reading the svn dump and identify to
which branch a following node belongs.
First step is to restructure svndump.c to be able to buffer one complete
revision for inspection before starting to write a commit to fast import.
Probably it's possible to feed the blobs to fast import directly and only
buffer node data and defer commit creation, but not the data.
Currently, at the beginning of a new revision on the svn side, a new commit is
created on top of a constant ref. When we support branches, we don't know the
ref, i.e. the branch(es), the revision changes, before reading all the 'Node-
*' lines.
+ feels more 'right'
- requires revision buffering
Generally:
Detect branches as they are created by 'Node-copyfrom*' to some commonly used
branch directories, like branches/. More complex branch detection can be
implemented later, of course.
Store detected branches permanently (necessary for incremental fetches), and
assign every file modification to one of those branches, if possible. Else
assign them to, hm ..
If a revision modifies more than one branch, create multiple commits.
Thanks for your comments and ideas!
--
Florian
next reply other threads:[~2012-08-03 9:43 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-03 9:43 Florian Achleitner [this message]
2012-08-03 18:17 ` GSOC remote-svn: branch detection Jonathan Nieder
2012-08-04 6:40 ` Dmitry Ivankov
2012-08-04 18:23 ` Ramkumar Ramachandra
2012-08-07 21:26 ` Florian Achleitner
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=12682331.q6WHVv9EKU@flomedio \
--to=florian.achleitner.2.6.31@gmail.com \
--cc=andrew-git@pileofstuff.org \
--cc=davidbarr@google.com \
--cc=git@vger.kernel.org \
--cc=jrnieder@gmail.com \
/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.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox