# # patch "ChangeLog" # from [69655d7337ed32e5439edf002d3df9149dc7f18e] # to [5ed0ea72fb56615cc9edbe8966bbbe219bc587c0] # # patch "revision.cc" # from [b3ece1f5f6cc636fcccd5b10f5372c36a0100f6b] # to [5ba596071c97348ce5707e50af20bd27a918fe49] # =============================================== --- ChangeLog 69655d7337ed32e5439edf002d3df9149dc7f18e +++ ChangeLog 5ed0ea72fb56615cc9edbe8966bbbe219bc587c0 @@ -1,5 +1,10 @@ 2005-07-26 Richard Levitte + * revision.cc (check_sane_history): Convert tabs to the + appropriate amount of spaces. + +2005-07-26 Richard Levitte + * sanity.hh, revision.cc (check_sane_history), change_set.cc (concatenate_change_sets, merge_change_sets, invert_change_set): Because boost currently uses the symbol M, we =============================================== --- revision.cc b3ece1f5f6cc636fcccd5b10f5372c36a0100f6b +++ revision.cc 5ba596071c97348ce5707e50af20bd27a918fe49 @@ -177,14 +177,14 @@ *current_to_child_changes_p, *old_to_child_changes_p); } - MM(*old_to_child_changes_p); + MM(*old_to_child_changes_p); // we have the change_set; now, is it one we've seen before? if (changesets.find(old_id) != changesets.end()) { // If it is, then make sure the paths agree on the // changeset. - MM(*changesets.find(old_id)->second); + MM(*changesets.find(old_id)->second); I(*changesets.find(old_id)->second == *old_to_child_changes_p); } else @@ -200,8 +200,8 @@ if (!null_id(old_id)) app.db.get_manifest(m_old_id, purported_m_child); apply_change_set(*old_to_child_changes_p, purported_m_child); - MM(purported_m_child); - MM(m_child); + MM(purported_m_child); + MM(m_child); I(purported_m_child == m_child); } }