"merge-upstream" + ConflictsInTree + "bzr revert" reverted to r1

[Daniel Hahler]

I started adding support for zip files to "bzr merge-upstream" and therefore had an empty (target) gz file. Because, basically I had only "gz = gzip.GzipFile(new_name, 'w')".

This caused "merge-upstream" to remove everything and then the commit failed:
[29787] 2008-07-05 01:57:31.845 WARNING: Conflict: can't delete debian because it is not empty. Not deleting.
[29787] 2008-07-05 01:57:31.969 INFO: 1 conflicts encountered.

I've done a quick "bzr st", have seen that there were a lot of changes/deletions and did "bzr revert", with the expectation to get back to revision 8, which I just had committed before.

But, instead, I'm now at revision 1 again ("import upstream from ...").

I'm attaching the relevant parts from "~/.bzr.log".

More info:
--------
$ bzr st -v
unknown:
  debian/

$ bzr info -v
Repository tree (format: pack-0.92)
Location:
  shared repository: /home/user/ubuntu/tvbrowser
  repository branch: .

Format:
       control: Meta directory format 1
  working tree: Working tree format 4
        branch: Branch format 6
    repository: Packs containing knits without subtree support

In the working tree:
      1782 unchanged
         0 modified
         0 added
         0 removed
         0 renamed
         1 unknown
         0 ignored
       239 versioned subdirectories

Branch history:
         1 revision
         1 committer
       161 days old
   first revision: Fri 2008-01-25 02:07:34 +0100
  latest revision: Fri 2008-01-25 02:07:34 +0100

Repository:
         8 revisions
      9770 KiB

I could repair the tree as follows (thanks to lifeless!):

$ bzr heads --all
HEAD: revision-id: email@domain-20080704233959-3eowyxvcquomq395 (dead)
  committer: Daniel Hahler <email@domain>
  branch nick: tvbrowser
  timestamp: Sat 2008-07-05 01:39:59 +0200
  message:
    debian/tvbrowser.install: install debian/tvbrowser32.xpm into pixmaps

$ bzr pull -r revid:email@domain-20080704233959-3eowyxvcquomq395 --overwrite .
+N debian/
[...]
+N debian/watch
Conflict adding file debian. Moved existing file to debian.moved.
1 conflicts encountered.
Now on revision 8.

$ bzr resolve debian

(the debian directory contained a single file, "rules.~1~" (IIRC) in the broken tree)

[James Westby (james-w)]

Hi Daniel,

This is a design problem in the current implementation
of builddeb. It will be rectified in the 2.0 release.

I'm glad you got it sorted.

It's high as it's a big problem and probably causes
a moment of panic, but there is no data loss as you
found, so it's not critical.

Thanks,

James

[James Westby (james-w)]

Hi,

This should no longer happen with 2.0.

Thanks,

James