Comment 0 for bug 245718

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