bzr-rewrite backtraces attempting a rewrite

[KarlGoetz]

 affects bzr-rewrite

I've pasted in my command history, the backtrace is at the very bottom
of the bug report.
thanks,
kk

10:08:41 kgoetz@epicfail:~/public_html/sourcecheckouts/gns-packages/debian-cd $ bzr pull
Using saved parent location: svn://svn.debian.org/debian-cd/trunk/
bzr: ERROR: These branches have diverged. Use the missing command to see how.
Use the merge command to reconcile them.
10:09:08 kgoetz@epicfail:~/public_html/sourcecheckouts/gns-packages/debian-cd $ bzr missing
Using saved parent location: svn://svn.debian.org/debian-cd/trunk/
You have 12 extra revision(s):
------------------------------------------------------------
revno: 1627
committer: Karl Goetz <email address hidden>
branch nick: debian-cd
timestamp: Fri 2010-03-12 12:34:35 +1030
message:
  Remove xprint-utils, we remove libxprintapputil1, which it depends on
------------------------------------------------------------
revno: 1626
committer: Karl Goetz <email address hidden>
branch nick: debian-cd
timestamp: Fri 2010-03-12 12:33:35 +1030
message:
  Remove all mozilla related packages from popcon
------------------------------------------------------------
revno: 1625
committer: Karl Goetz <email address hidden>
branch nick: debian-cd
timestamp: Fri 2010-03-12 12:07:24 +1030
message:
  Remove iceweasel, and all dependent packages from install cd.
------------------------------------------------------------
revno: 1624 [merge]
committer: Karl Goetz <email address hidden>
branch nick: debian-cd
timestamp: Mon 2010-02-22 17:14:04 +1030
message:
  Merge latest debian-cd changes, includes a number of my patches/bugs
------------------------------------------------------------
revno: 1623
committer: Karl Goetz <email address hidden>
branch nick: debian-cd
timestamp: Sat 2010-02-20 19:07:53 +1030
message:
  Patch to gNSify d-cd
------------------------------------------------------------
revno: 1622
committer: Karl Goetz <email address hidden>
branch nick: debian-cd
timestamp: Sat 2010-02-20 18:47:06 +1030
message:
  Shrink arches to those we do/will support
------------------------------------------------------------
revno: 1621
committer: Karl Goetz <email address hidden>
branch nick: debian-cd
timestamp: Sat 2010-02-20 18:21:17 +1030
message:
  adding tasks/metad. definitely needs a lot of customisation
------------------------------------------------------------
revno: 1620
committer: Karl Goetz <email address hidden>
branch nick: debian-cd
timestamp: Sat 2010-02-20 17:31:34 +1030
message:
  gNS changelog entry. fill in more details as possible
------------------------------------------------------------
revno: 1619
committer: Karl Goetz <email address hidden>
branch nick: gns-cd
timestamp: Fri 2010-02-19 12:39:59 +1030
message:
  scripts to make bootable cds
------------------------------------------------------------
revno: 1618
committer: Karl Goetz <email address hidden>
branch nick: gns-cd
timestamp: Fri 2010-02-19 12:26:06 +1030
message:
  metad install script. direct copy of lenny for the moment
------------------------------------------------------------
revno: 1617
committer: Karl Goetz <email address hidden>
branch nick: gns-cd
timestamp: Fri 2010-02-19 11:47:39 +1030
message:
  remove hard coded /updates/ in security uri. wonder if steve would accept
  a patch to un-hardcode it
------------------------------------------------------------
revno: 1616
committer: Karl Goetz <email address hidden>
branch nick: gns-cd
timestamp: Fri 2010-02-19 11:38:14 +1030
message:
  start of a metad data dir. removed all the arches we won't be bothering
  with in metad. left with amd64/arm/i386/mipsel/powerpc

You are missing 2 revision(s):
------------------------------------------------------------
revno: 1627
svn revno: 1985 (on /trunk)
committer: fjp
timestamp: Fri 2010-03-12 01:18:05 +0000
message:
  Excluding reiserfs4 udebs is not needed for Squeeze

  They are no longer being built.
------------------------------------------------------------
revno: 1626
svn revno: 1984 (on /trunk)
committer: fjp
timestamp: Fri 2010-03-12 01:18:01 +0000
message:
  Exclude udebs for X.Org-based version of the Graphical Installer

  If needed they will all be included in the D-I images.
10:09:50 kgoetz@epicfail:~/public_html/sourcecheckouts/gns-packages/debian-cd $ bzr help rewrite
Rebase support.

The Bazaar rebase plugin adds support for rebasing branches to Bazaar.
It adds the command 'rebase' to Bazaar. When conflicts occur when replaying
patches, the user can resolve the conflict and continue the rebase using the
'rebase-continue' command or abort using the 'rebase-abort' command.
10:10:01 kgoetz@epicfail:~/public_html/sourcecheckouts/gns-packages/debian-cd $ bzr rebase
Rebasing on svn://svn.debian.org/debian-cd/trunk/
bzr: ERROR: Working tree "/home/kgoetz/public_html/sourcecheckouts/gns-packages/debian-cd/" has uncommitted changes (See bzr status).
10:10:19 kgoetz@epicfail:~/public_html/sourcecheckouts/gns-packages/debian-cd $ bzr status
modified:
  data/squeeze/exclude-udebs
  debian/changelog
pending merge tips: (use -v to see all merge revisions)
  fjp 2010-03-12 Excluding reiserfs4 udebs is not needed for Squeeze
10:10:24 kgoetz@epicfail:~/public_html/sourcecheckouts/gns-packages/debian-cd $ bzr revert
 M data/squeeze/exclude-udebs
 M debian/changelog
10:10:27 kgoetz@epicfail:~/public_html/sourcecheckouts/gns-packages/debian-cd $ bzr rebase
Rebasing on svn://svn.debian.org/debian-cd/trunk/
All changes applied successfully.
Committing to: /home/kgoetz/public_html/sourcecheckouts/gns-packages/debian-cd/
added data/metad
added data/metad/README.html.in
added data/metad/amd64_businesscard_udeb_include
added data/metad/amd64_netinst_udeb_include
added data/metad/amd64_udeb_include
added data/metad/arm_businesscard_udeb_include
added data/metad/arm_netinst_udeb_include
added data/metad/arm_udeb_include
added data/metad/debian-61.png
added data/metad/debinstall-print.css
added data/metad/debinstall.css
added data/metad/delo.conf
added data/metad/dot_bw.gif
added data/metad/exclude-udebs
added data/metad/exclude-udebs-amd64
added data/metad/exclude-udebs-i386
added data/metad/exclude-udebs-powerpc
added data/metad/gradient.png
added data/metad/i386_businesscard_udeb_include
added data/metad/i386_netinst_udeb_include
added data/metad/i386_udeb_include
added data/metad/mipsel_businesscard_udeb_include
added data/metad/mipsel_netinst_udeb_include
added data/metad/mipsel_udeb_include
added data/metad/openlogo-nd-50.png
added data/metad/pegasos
added data/metad/powerpc_businesscard_udeb_include
added data/metad/powerpc_netinst_udeb_include
added data/metad/powerpc_udeb_include
added data/metad/udeb_exclude
added data/metad/yaboot
added data/metad/pegasos/pegasos
added data/metad/yaboot/boot.msg
added data/metad/yaboot/ofboot.b
added data/metad/yaboot/yaboot.conf
Committed revision 1628.
All changes applied successfully.
Committing to: /home/kgoetz/public_html/sourcecheckouts/gns-packages/debian-cd/
modified tools/apt-selection
Committed revision 1629.
All changes applied successfully.
Committing to: /home/kgoetz/public_html/sourcecheckouts/gns-packages/debian-cd/
added tools/metad
added tools/metad/installtools.sh
Committed revision 1630.
All changes applied successfully.
Committing to: /home/kgoetz/public_html/sourcecheckouts/gns-packages/debian-cd/
added tools/boot/metad
added tools/boot/metad/boot-amd64
added tools/boot/metad/boot-armel
added tools/boot/metad/boot-i386
added tools/boot/metad/boot-mipsel
added tools/boot/metad/boot-powerpc
added tools/boot/metad/boot-x86
added tools/boot/metad/common.sh
added tools/boot/metad/x86-desktop.sh
Committed revision 1631.
Text conflict in debian/changelog
1 conflicts encountered.
bzr: ERROR: A conflict occurred replaying a commit. Resolve the conflict and run 'bzr rebase-continue' or run 'bzr rebase-abort'.
10:10:38 kgoetz@epicfail:~/public_html/sourcecheckouts/gns-packages/debian-cd $ vi debian/changelog
changelog changelog.BASE changelog.OTHER changelog.THIS
10:10:38 kgoetz@epicfail:~/public_html/sourcecheckouts/gns-packages/debian-cd $ vi debian/changelog
10:11:33 kgoetz@epicfail:~/public_html/sourcecheckouts/gns-packages/debian-cd $ bzr rebase-continue
bzr: ERROR: There are still conflicts present. Resolve the conflicts and then run 'bzr resolve' and try again.
10:11:40 kgoetz@epicfail:~/public_html/sourcecheckouts/gns-packages/debian-cd $ bzr resolve
All conflicts resolved.
10:11:43 kgoetz@epicfail:~/public_html/sourcecheckouts/gns-packages/debian-cd $ bzr rebase-continue
Committing to: /home/kgoetz/public_html/sourcecheckouts/gns-packages/debian-cd/
modified debian/changelog
Committed revision 1632.
All changes applied successfully.
Committing to: /home/kgoetz/public_html/sourcecheckouts/gns-packages/debian-cd/
added tasks/metad
added tasks/metad/Debian-all
added tasks/metad/Debian-generic
added tasks/metad/Debian-gnome
added tasks/metad/Debian-kde
added tasks/metad/Debian-light
added tasks/metad/Debian-lxde
added tasks/metad/Debian-xfce
added tasks/metad/empty
added tasks/metad/exclude
added tasks/metad/forcd1
added tasks/metad/interesting-fromcd23
added tasks/metad/popularity-contest
added tasks/metad/task.list.all
added tasks/metad/task.list.generic
added tasks/metad/task.list.gnome
added tasks/metad/task.list.kde
added tasks/metad/task.list.light
added tasks/metad/task.list.lxde
added tasks/metad/task.list.xfce
added tasks/metad/tasksel_d-i.languages
added tasks/metad/unexclude-CD2
Committed revision 1633.
bzr: ERROR: bzrlib.errors.NoSuchRevision: CHKInventoryRepository('file:///home/kgoetz/public_html/sourcecheckouts/gns-packages/debian-cd/.bzr/repository/') has no revision ('<email address hidden>',)

Traceback (most recent call last):
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 842, in exception_to_return_code
    return the_callable(*args, **kwargs)
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 1037, in run_bzr
    ret = run(*run_argv)
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 654, in run_argv_aliases
    return self.run(**all_cmd_args)
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 1052, in ignore_pipe
    result = func(*args, **kwargs)
  File "/home/kgoetz/.bazaar/plugins/rewrite/commands.py", line 270, in run
    workingtree_replay(wt, merge_type=merge_type))
  File "/home/kgoetz/.bazaar/plugins/rewrite/rebase.py", line 321, in rebase
    replay_fn(repository, revid, newrevid, newparents)
  File "/home/kgoetz/.bazaar/plugins/rewrite/rebase.py", line 510, in replay
    merge_type=merge_type)
  File "/home/kgoetz/.bazaar/plugins/rewrite/rebase.py", line 481, in replay_delta_workingtree
    complete_revert(wt, [newparents[0]])
  File "/home/kgoetz/.bazaar/plugins/rewrite/rebase.py", line 548, in complete_revert
    newtree = wt.branch.repository.revision_tree(newparents[0])
  File "/usr/lib/python2.5/site-packages/bzrlib/decorators.py", line 138, in read_locked
    result = unbound(self, *args, **kwargs)
  File "/usr/lib/python2.5/site-packages/bzrlib/repository.py", line 2568, in revision_tree
    inv = self.get_revision_inventory(revision_id)
  File "/usr/lib/python2.5/site-packages/bzrlib/decorators.py", line 138, in read_locked
    result = unbound(self, *args, **kwargs)
  File "/usr/lib/python2.5/site-packages/bzrlib/repository.py", line 2527, in get_revision_inventory
    return self.get_inventory(revision_id)
  File "/usr/lib/python2.5/site-packages/bzrlib/decorators.py", line 138, in read_locked
    result = unbound(self, *args, **kwargs)
  File "/usr/lib/python2.5/site-packages/bzrlib/repository.py", line 2357, in get_inventory
    return self.iter_inventories([revision_id]).next()
  File "/usr/lib/python2.5/site-packages/bzrlib/repofmt/groupcompress_repo.py", line 895, in _iter_inventories
    raise errors.NoSuchRevision(self, record.key)
NoSuchRevision: CHKInventoryRepository('file:///home/kgoetz/public_html/sourcecheckouts/gns-packages/debian-cd/.bzr/repository/') has no revision ('<email address hidden>',)

bzr 2.0.3 on python 2.5.2 (Linux-2.6.30.7-libre-fshoppe1-i686-with-debian-5.0.3)
arguments: ['/usr/bin/bzr', 'rebase-continue']
encoding: 'UTF-8', fsenc: 'UTF-8', lang: 'en_AU.UTF-8'
plugins:
  cia /home/kgoetz/.bazaar/plugins/cia [1.0.0dev]
  fastimport /home/kgoetz/.bazaar/plugins/fastimport [0.9.0dev]
  launchpad /usr/lib/python2.5/site-packages/bzrlib/plugins/launchpad [2.0.3]
  netrc_credential_store /usr/lib/python2.5/site-packages/bzrlib/plugins/netrc_credential_store [2.0.3]
  rewrite /home/kgoetz/.bazaar/plugins/rewrite [0.5.5]
  svn /home/kgoetz/.bazaar/plugins/svn [1.0.3dev]

*** Bazaar has encountered an internal error. This probably indicates a
    bug in Bazaar. You can help us fix it by filing a bug report at
        https://bugs.launchpad.net/bzr/+filebug
    including this traceback and a description of the problem.

--
Karl Goetz, (Kamping_Kaiser / VK5FOSS)
Debian contributor / gNewSense Maintainer
http://www.kgoetz.id.au
No, I won't join your social networking group

[KarlGoetz (kgoetz)]

FTR, i tarred up this branch, so i can use it for testing.