Bazaar

  1. Bug #4700
  2. Comment #3

Comment 3 for bug 4700

Revision history for this message
Brad Bollenbach (bradb) wrote :

Here's another example of this strange behaviour:

bradb@oxygen:~/canonical/malone-bzr-integration $ bzr merge ../launchpad-upstream/
Inventory ok.
bzr: WARNING: Conflict adding files to lib/canonical/lp/z3batching. Not deleting.
1 conflicts encountered.
bradb@oxygen:~/canonical/malone-bzr-integration $ bzr conflicts
bradb@oxygen:~/canonical/malone-bzr-integration $

My mental model tells me that, if N conflicts are encountered, bzr conflicts should show N conflicted files.