Ubuntu
bzr package

  1. Bug #322767
  2. Comment #2

Comment 2 for bug 322767

Revision history for this message
Martin Pool (mbp) wrote :

Regarding the .BASE/.THIS/.OTHER files, I'm not sure I understand the case where they could end up being committed. If you get a conflict then do

 bzr add foo.c.OTHER
 bzr resolve foo.c
 bzr commit

The resolve command should have deleted foo.c.OTHER so it seems like it'd be pretty hard to end up with them being committed, unless you specially save the file and restore it after resolving the conflicts?

If the .moved file is left behind when resolve succeeds that is a bug.