[darcs-users] re-synchronize Darcs and Git repository

[Henning Thielemann]

Years ago I did a one-time conversion of a Git repository to Darcs. Now I 
want to reactivate and resynchronize to the old Git repository.

I created darcs.marks and git.marks manually, both ending with the same 
patch. However, it appears that the Git repository has less commits than 
the Darcs repository. Maybe Darcs got some patches from Git branches?

When doing incremental patch transfer, git-fast-import complains about the 
gap between the number of the last git commit and the new darcs commit.

As a quick hack I repeated the last commit in git.marks until the line 
numbers in darcs.marks and git.marks match. Now, Git starts importing 
patches but aborts with:

...
progress (patches converted)
progress (cleaning up)
progress done
Warnung: Not updating refs/heads/master (new tip 
8edfcacc61dc7c6cc35ad8f52a95bc9a18a7e40b does not contain 
4e08f55977f6b3090b38e1331551a59cf207c5cc)
fast-import statistics:
...


In a next attempt I could try to manually decrease patch numbers in the 
output of 'darcs export'. But I would have to do this for every export.

Or do you think, converting forth and back Git cannot work?