All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jan Teske <jan.teske@gmail.com>
To: git@vger.kernel.org
Subject: git-svn: Handling of branches created from subfolders
Date: Sat, 19 Aug 2017 14:45:58 +0200	[thread overview]
Message-ID: <1ED00C5D-177C-4F95-8261-BFB7345B7C08@gmail.com> (raw)

Hello,

I’m trying to do a one-time conversion of a large SVN repository to git using git-svn. Unfortunately, this SVN repo contains a substantial amount of non-standard branches created from a subfolder of trunk/. Users that only need to work on part of the code inside the repo usually create such branches to avoid having to download unneeded files.

A toy example showing what I’m talking about:

trunk/
    - subfolder1/
        - …
    - subfolder2/
        - …
branches/
    - branch1/ (initially cp’ed from trunk/subfolder1)
        - …
    - branch2/ (initially cp’ed from trunk/subfolder2)
        - …
    - branch3/ (initially cp’ed from trunk)
        - …

While in my experience, git-svn is able to correctly handle branches/branch3, it fails on branch1 and branch2. By "fails" I mean that it still performs the conversion, but any relationship to the trunk is completely missing. Instead, in the resulting git repository it looks like those branches have a completely separate history, starting from nothing.

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?

Thanks!
    

             reply	other threads:[~2017-08-19 12:45 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-08-19 12:45 Jan Teske [this message]
2017-08-20 10:27 ` git-svn: Handling of branches created from subfolders Andreas Heiduk
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=1ED00C5D-177C-4F95-8261-BFB7345B7C08@gmail.com \
    --to=jan.teske@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. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.