From: Andreas Heiduk <asheiduk@gmail.com>
To: Jan Teske <jan.teske@gmail.com>, git@vger.kernel.org
Subject: Re: git-svn: Handling of branches created from subfolders
Date: Sun, 20 Aug 2017 12:27:59 +0200 [thread overview]
Message-ID: <8c910a5b-ed96-41d4-d157-f138af51011f@gmail.com> (raw)
In-Reply-To: <1ED00C5D-177C-4F95-8261-BFB7345B7C08@gmail.com>
Am 19.08.2017 um 14:45 schrieb Jan Teske:
> Is there any way to fix such branches from subfolders in a way that they integrate correctly with the converted git repository, without losing any (or at least too much) history? If this is not possible with git-svn directly, maybe I could prepare the SVN repo or post-process the converted git repository somehow?
You can use `git replace --graft` to connect the first commit of the
loose branches with their source. After all connections are in place you
can use `git filter-branch` to make the replacements permanent.
This will not change the content or directory structure of branch1 or
branch2 but the diff with their parent commits will show up as a huge
delete/rename operation. So merging/Cherry-picking between trunk and
branch1/branch2 will be ... challenging.
next prev parent reply other threads:[~2017-08-20 10:28 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-19 12:45 git-svn: Handling of branches created from subfolders Jan Teske
2017-08-20 10:27 ` Andreas Heiduk [this message]
2017-08-20 17:42 ` Jan Teske
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=8c910a5b-ed96-41d4-d157-f138af51011f@gmail.com \
--to=asheiduk@gmail.com \
--cc=git@vger.kernel.org \
--cc=jan.teske@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;
as well as URLs for NNTP newsgroup(s).