"bzr merge" doesn't work anymore?

Christian Tschabuschnig tschaboo at gmx.at
Mon Apr 27 05:34:03 BST 2009


I recently upgraded from hardy to jaunty and therefore i now have bazaar
1.13.1. If i merge a single revision from another branch it now happens
(not always, but most of the time) that bazaar doesn't "remember" that
it did merge a revision but simply modifies the file. I think it's
clearer if i give an example. In the attached file, where i entered "bzr
stat" i'd expect something like "pending merges". Also in the
revision-log there should be some hint, that this was a merge, not a
mere edit! I didn't report this as a bug, since it seems unlikely that
you would oversee "merge" not working. So where am i wrong?

Christian


-- 
A: Because it messes up the order in which people normally read text.
Q: Why is top-posting such a bad thing?
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: doesnt_work.txt
Url: https://lists.ubuntu.com/archives/bazaar/attachments/20090427/3bff9e01/attachment.txt 


More information about the bazaar mailing list