Bazaar

  1. Bug #175373
  2. Comment #2

Comment 2 for bug 175373

Revision history for this message
Dato Simó (dato) wrote : Re: [Bug 175373] Re: Cannot merge -r 0..-1 in an empty branch

> ** This bug has been marked a duplicate of bug 56663
> merge degrades to pull in an empty branch from bzr 0.10 on

Well, at the moment plain `merge` (without -r argument) does not degrade
to pull. It hits this as well:

> > % bzr update
> > -D foo
> > -D bar
> > All changes applied successfully.
> > bzr: ERROR: Reserved revision-id {null:}

> ^^ This bug should be fixed.

So maybe there should be two separate bug numbers: one for having merge
do a real merge on empty branches, and leave it open, another for the
one you said "this one should be fixed".