git-remote-bzr: fatal: mark :399654 not declared

git-remote-bzr: fatal: mark :399654 not declared

[Rüdiger Sonderfeld]

Hello,
I'm using git-remote-bzr to access the GNU Emacs Bazaar repo.  I followed the 
guideline described here: 
https://lists.gnu.org/archive/html/emacs-devel/2013-05/msg00008.html

Pulling and pushing worked flawless for several month.  But recently git 
bzr stopped working with the following error message:

$ git pull
fatal: mark :399654 not declared
fast-import: dumping crash report to .git/fast_import_crash_16173
fatal: Error while running fast-import
Traceback (most recent call last):
  File "/usr/bin/git-remote-bzr", line 947, in <module>
    sys.exit(main(sys.argv))
  File "/usr/bin/git-remote-bzr", line 931, in main
    do_import(parser)
  File "/usr/bin/git-remote-bzr", line 399, in do_import
    export_branch(repo, name)
  File "/usr/bin/git-remote-bzr", line 327, in export_branch
    modified_final = export_files(cur_tree, modified)
  File "/usr/bin/git-remote-bzr", line 272, in export_files
    print d
IOError: [Errno 32] Broken pipe

And the crash report

$ cat .git/fast_import_crash_16173
fast-import crash report:
    fast-import process: 16173
    parent process     : 16172
    at Thu Feb 6 18:38:00 2014

fatal: mark :399654 not declared

Most Recent Commands Before Crash
---------------------------------
  feature done
  feature import-marks=.git/bzr/origin/marks-git
  feature export-marks=.git/bzr/origin/marks-git
  feature force
  blob
  mark :399656
  data 145827
  blob
  mark :399657
  data 19785
  blob
  mark :399658
  data 228415
  commit refs/bzr/origin/heads/trunk
  mark :399659
  author Glenn Morris <rgm@gnu.org> 1391150391 -0800
  committer Glenn Morris <rgm@gnu.org> 1391150391 -0800
  data 101
* from :399654

Active Branch LRU
-----------------
    active_branches = 0 cur, 5 max

  pos  clock name
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Inactive Branches
-----------------
refs/bzr/origin/heads/trunk:
  status      : dirty
  tip commit  : 0000000000000000000000000000000000000000
  old tree    : 0000000000000000000000000000000000000000
  cur tree    : 0000000000000000000000000000000000000000
  commit clock: 0
  last pack   :


Marks
-----
  exported to .git/bzr/origin/marks-git

-------------------
END OF CRASH REPORT

$ tail .git/bzr/origin/marks-git
:399643 b535a54e6bd1b98953aacda8e0c0bd4ffa4348e8
:399646 2c7d42a26b8984b4492b205f28b0de2ff8548a16
:399647 408cc787f4764481e8ca10861895970e579dec07
:399648 798ea0615d18b41dfe0dee321b286fd3570a4352
:399651 dfba6da980cfe657cb1be302131325011f5eb97d
:399652 5964046e0475262b27157e39ceb7516b1222330c
:399653 52dd3850ce599215898f5358997dd07f08c4d607
:399656 230b94e2fe9c6443b2ada399d8d985c7ae438727
:399657 8d0fc723f14c9b4a9de30754170b5ca5be21a05a
:399658 102818c18b5a0724dc1c11dc5dcf5e2ba5b72b22

I'm using git version 1.8.5.3 on Kubuntu 13.10 installed from 
https://launchpad.net/~git-core/+archive/ppa.

What's wrong and how can I fix this?

Regards,
Rüdiger

RE: git-remote-bzr: fatal: mark :399654 not declared

[Felipe Contreras]

Rüdiger Sonderfeld wrote:
> I'm using git-remote-bzr to access the GNU Emacs Bazaar repo.  I followed the 
> guideline described here: 
> https://lists.gnu.org/archive/html/emacs-devel/2013-05/msg00008.html
> 
> Pulling and pushing worked flawless for several month.  But recently git 
> bzr stopped working with the following error message:

Sorry for the late reply.

So basically your repository is screwed up. I just sent patches to the Git's
core so it doesn't happen again.

To recover the easiest is to remove these files: .git/bzr/origin/marks-*, in
your repository, and then run `git fetch`. However, when you do that basically
you have to fetch everything again.

You could also try this script I wrote[1]. If you run `git marks-check -mbzr -v
-f origin` it will find all the issues in the mark files and fix them. Then run
`git fetch` again.

Cheers.

[1] https://gist.github.com/felipec/10551806

-- 
Felipe Contreras