# # patch "git.cc" # from [011d15fd165c213d216933cfe71e7ee7c9c6d9e0] # to [90ca860d7d5058c03d86ce8b26e28cba87a54a7f] # ======================================================================== --- git.cc 011d15fd165c213d216933cfe71e7ee7c9c6d9e0 +++ git.cc 90ca860d7d5058c03d86ce8b26e28cba87a54a7f @@ -448,13 +448,24 @@ { manifest_map::const_iterator j = m_old.find(*i); manifest_map::const_iterator k = m_new.find(*i); + L(F("full_change_set: looking up '%s' - hits old %d and new %d") + % *i % (j != m_old.end()) % (k != m_new.end())); if (j == m_old.end()) - cs.add_file(*i, manifest_entry_id(k)); + { + L(F("full_change_set: adding %s") % manifest_entry_id(k)); + cs.add_file(*i, manifest_entry_id(k)); + } else if (k == m_new.end()) - cs.delete_file(*i); + { + L(F("full_change_set: deleting %s") % manifest_entry_id(j)); + cs.delete_file(*i); + } else if (!(manifest_entry_id(j) == manifest_entry_id(k))) - cs.deltas.insert(std::make_pair(*i, std::make_pair(manifest_entry_id(j), - manifest_entry_id(k)))); + { + L(F("full_change_set: delta %s -> %s") % manifest_entry_id(j) % manifest_entry_id(k)); + cs.deltas.insert(std::make_pair(*i, std::make_pair(manifest_entry_id(j), + manifest_entry_id(k)))); + } } } @@ -585,6 +596,12 @@ // complete_change_set(parent_man, manifest, *changes); full_change_set(parent_man, manifest, *changes); + { + data cset; + write_change_set(*changes, cset); + L(F("Changeset:\n%s") % cset()); + } + edges.insert(make_pair(parent_rev, make_pair(parent_mid, changes))); } else if (keyword == "committer")