[Monotone-commits-diffs] net.venge.monotone: 79e73d6882ea68c70abd5891f47806eabe5d0f10

[code]

revision:            79e73d6882ea68c70abd5891f47806eabe5d0f10
date:                2013-03-16T09:57:19
author:              address@hidden
branch:              net.venge.monotone
changelog:
* src/merge_content.cc (get_dropped_details): fix obvious reference after erase 
bug

manifest:
format_version "1"

new_manifest [1d302958bc598967961e414ba5720cc5ecf7be94]

old_revision [5e1057295bf12fa86849dc5aed4577e1788d367e]

patch "src/merge_content.cc"
 from [095c2d20ac8d8d495806f6463c311d253cb6a686]
   to [b3aeba9d9a98bf032c7771ae7426e9209085f070]
============================================================
--- src/merge_content.cc	095c2d20ac8d8d495806f6463c311d253cb6a686
+++ src/merge_content.cc	b3aeba9d9a98bf032c7771ae7426e9209085f070
@@ -1,5 +1,5 @@
 // Copyright (C) 2008 Nathaniel Smith <address@hidden>
-//               2008, 2010, 2012 Stephen Leake <address@hidden>
+//               2008, 2010, 2012, 2013 Stephen Leake <address@hidden>
 //
 // This program is made available under the GNU GPL version 2.0 or
 // greater. See the accompanying file COPYING for details.
@@ -204,9 +204,9 @@ content_merge_database_adaptor::get_drop
         }
       else
         {
-          parents.erase (i);
           set<revision_id> more_parents;
           db.get_revision_parents(*i, more_parents);
+          parents.erase (i);
           parents.insert(more_parents.begin(), more_parents.end());
         }
     }