Home/ Questions/Q 3430026
In Process

The Archive Base Latest Questions

Editorial Team
  • 0
Asked: 2026-05-18T07:09:16+00:00

I have some code in a Git repository that needs to be synchronized with

  • 0

I have some code in a Git repository that needs to be synchronized with a SVN repository. My recipe looks like this:

  1. Create a SVN repository (local, for testing, will be a remote one).
  2. Create initial layout, commit 1 revision
  3. git svn clone -T '/trunk' <REPO> a new Git repository based on the initial commit.
  4. git remote add dev <ORIGINAL> followed by a git pull dev <ORIGINAL_BRANCH>. Now I have my master branch in the repository based on the initial SVN commit.
  5. git svn rebase which would be followed by dcommit.

Step 5) however fails with:

Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging X
Applying: Y
Applying: Z
Using index info to reconstruct a base tree...
<stdin>:269: trailing whitespace.

<stdin>:315: trailing whitespace.

<stdin>:400: trailing whitespace.
     * Method 2.6. Returns zero or two elements 
<stdin>:3762: trailing whitespace.

warning: 4 lines add whitespace errors.
Falling back to patching base and 3-way merge...

Followed by a couple of “Auto-merging” and “CONFLICT (content)” messages the rebase finally halts with a friendly “Failed to merge in the changes”. Is there anything I can do to have these conflicts resolved automatically? I do not even understand how conflicts can occur when rebasing!

Share

Leave an answer

You must login to add an answer.

Need An Account,

1 Answer

  1. Editorial Team

    I am giving up and use set-tree instead. A git rebase -p results in a history with the artificial git-svn initial commit at root, followed by the initial commit from the original Git repository…

    For completeness my references for the three approaches tried:

    1. http://code.google.com/p/support/wiki/ImportingFromGit – git rebase
    2. http://markpasc.livejournal.com/186297.html – git svn rebase
    3. http://repo.or.cz/w/nagiosplugins.git?a=blob;f=tools/git2svn.pl – set-tree
    • 0