'conflicts in tree' check happens after commit message editor

[Robert Collins]

Which is annoying

 affects products/bzr
--
GPG key available at: <http://www.robertcollins.net/keys.txt>.

Attachment: unnamed
Type: application/pgp-signature; name=signature.asc
URL: http://librarian.launchpad.net/1207073/unnamed

[Martin Pool (mbp)]

Robert has a patch that fixes it, but it's part of a larger change deferred until after 0.8.

[John A Meinel (jameinel)]

Bug still present in bzr.dev

Test case:

$ bzr init foo
$ cd foo
$ echo a > a
$ bzr commit -m a
$ cd ..
$ bzr branch foo bar
$ echo b >> foo/a
$ bzr commit -m b foo/a
$ echo c >> bar/a
$ bzr commit -m c bar/a
$ cd bar
$ bzr merge ../foo
# This creates a conflict

$ bzr commit
# This brings up the commit editor, which even shows that there is a conflict, but doesn't stop processing until the commit editor returns.

[wouter bolsterlee (wbolster)]

This bug causes data loss: my newly written commit message is totally discarded if the tree is not up-to-date (lightweight checkouts) and I try to commit: I type my message and see the tree-out-of-sync error afterwards, causing the commit to fail.

[Jelmer Vernooij (jelmer)]

It might be a good idea to keep the log message around and tell the user where it is if the actual commit failed, like Subversion does.

[wouter bolsterlee (wbolster)]

That sounds like a good idea, but the bug remains: commit checks should be done BEFORE the editor spawns and again AFTER the editor closes. The first check is just to help the user, the second check is required to maintain tree/repo consistency.

[John A Meinel (jameinel)]

Downgrading to Confirmed because bug was not actually fixed.
Also doesn't seem like it should block 0.9, can be upgraded if we want it to block.