revert after merge should clear conflicts for files selected by recursion

[Martin Pool]

nt

[Aaron Bentley (abentley)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Martin Pool wrote:
> Public bug reported:
>
> nt

It usually does. Can you provide an example of when it doesn't?
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFGE6cg0F+nu1YWqI0RAh3QAJ9JRBLVvhr4bqjbLJAwZBt7ebr0NQCeIK5s
6ufL5/cm54WSi92X0jLBD6w=
=/yZb
-----END PGP SIGNATURE-----

[Martin Pool (mbp)]

I tried to reproduce this and couldn't, so I'm not sure where the problem was.

[Robert Collins (lifeless)]

On Tue, 2007-07-17 at 03:13 +0000, Martin Pool wrote:
> I tried to reproduce this and couldn't, so I'm not sure where the
> problem was.

It should be reproducible with the branches listed for the other merge
thing discovered during europython.... I saw this bug happen myself.
I'll try to look at this in the next week

 assignee lifeless
 status confirmed
--
GPG key available at: <http://www.robertcollins.net/keys.txt>.

[Alexander Belchenko (bialix)]

bzr 0.18.0

I did cherrypicking merge and have many conflicts. Then I try to revert some files in some dir:

$ bzr revert .

After this command all conflicted files reverted to their previous state, but they still listed as conflicts, and .BASE/.THIS/.OTHERS files also still here.

[John A Meinel (jameinel)]

I'm not sure what caused this, but it seems to differ based on what you revert:

bzr revert foo

Will remove foo.BASE, foo.OTHER, foo.THIS, and will remove a conflict marker for foo.

Hower

bzr revert dir/

Will revert dir/foo
but it won't removed dir/foo.BASE, and it will leave dir/foo marked as 'conflicted'