Activity log for bug #36399
| Date | Who | What changed | Old value | New value | Message |
|---|---|---|---|---|---|
| 2006-03-24 10:30:52 | David Allouche | bug | added bug | ||
| 2006-04-24 09:06:21 | Martin Pool | bzr: status | Unconfirmed | Confirmed | |
| 2006-04-24 09:06:21 | Martin Pool | bzr: statusexplanation | Still a bug in bzr.dev today. This behaviour is consistent with CVS, but adding the newline would probably be better. As a compromise we could show <<<<<<< THIS [no eol] | ||
| 2006-07-21 22:36:53 | John A Meinel | bzr: importance | Medium | Low | |
| 2006-07-21 22:36:53 | John A Meinel | bzr: statusexplanation | Still a bug in bzr.dev today. This behaviour is consistent with CVS, but adding the newline would probably be better. As a compromise we could show <<<<<<< THIS [no eol] | This bug still exists. We end up with: foo <<<<<<< TREE baz======= bar>>>>>>> MERGE-SOURCE At the end of the file. As mentioned, this is consistent with CVS, so I'm making the priority Low, and it shouldn't block 0.9 | |
| 2011-02-01 18:18:10 | Jelmer Vernooij | tags | conflicts | ||
| 2011-06-14 07:56:15 | Max Bowsher | removed subscriber Bazaar Developers | |||
| 2017-11-09 00:29:12 | Jelmer Vernooij | tags | conflicts | check-for-breezy conflicts |
