# # # patch "NEWS" # from [e8fc0a6f14177e59c3ee6e2d8900fd448ae2bfc4] # to [622fdd3ee1f145184aa823b515c9dd16ebbbb929] # ============================================================ --- NEWS e8fc0a6f14177e59c3ee6e2d8900fd448ae2bfc4 +++ NEWS 622fdd3ee1f145184aa823b515c9dd16ebbbb929 @@ -71,6 +71,14 @@ xxx xxx xx xx:xx:xx UTC 2010 interrupted (^C). This was broken in 0.47 when it was fixed to not throw an exception on being interrupted. + - In 0.46 and 0.47, monotone could sometimes get confused about which + revisions were the heads of a particular branch. This would happen + when a new branch cert was added to a revision that was an ancestor + of one or more of the current heads of the branch, most commonly + during netsync when multiple people had performed identical merges. + This is fixed now. If your database currently gives incorrect 'heads' + results, you can fix it by either running 'mtn db regenerate_caches'. + Other - Support for the diffuse merger (http://diffuse.sourceforge.net)