Comment 2 for bug 4700

On 21-Nov-05, at 5:48 PM, Aaron Bentley wrote:

> Public bug report changed:
> https://launchpad.net/malone/bugs/4700
>
> Comment:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> Brad Bollenbach wrote:
> | I'm guessing then that the conflicts and the WARNINGs are
> related, but
> | this is confusing.
>
> There were no textual conflicts, just tree-shape conflicts, which are
> reported as WARNINGs, like other conflicts. The conflicts were: merge
> wanted to remove two directories, but your working copy had files that
> it didn't expect to find there. These conflicts were handled by
> merely
> unversioning the directories, instead of deleting them as usual.

Any thoughts on how this information can be presented in the UI?
Here's an idea (that probably doesn't make complete sense, because I
don't have the context of being a bazaar developer):

---
$ bzr conflicts
bazaar wanted to remove the following directories:

foo/bar
foo/bar/baz

but couldn't, because these directories were not empty. (Perhaps they
contain ignored files? See "bzr ignored".)

To resolve this conflict, you could try examining the contents of
these directories and, if they contain files that you no longer need,
you can probably safely remove these directories manually (e.g. "rm -
r foo/bar".)
---

http://headrush.typepad.com/creating_passionate_users/2005/10/
making_happy_us.html

I'm still working my way through the "I suck" phase with bazaar. :)

Cheers,

--
Brad Bollenbach