From 55dcc17c331f580b3beeb4d5decf64d3baf94f2e Mon Sep 17 00:00:00 2001 From: Sebastian Thiel Date: Thu, 24 Jun 2010 16:02:28 +0200 Subject: aggressive_tree_merge: fixed incorrect handling of one branch, it was just not implemented causing incorrect merge results. Added test to cover this issue Diff: added NULL_BIN_SHA constant for completeness --- CHANGES | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'CHANGES') diff --git a/CHANGES b/CHANGES index 2f93b3e7..a1b9b2ba 100644 --- a/CHANGES +++ b/CHANGES @@ -6,7 +6,8 @@ CHANGES * ConcurrentWriteOperation was removed, and replaced by LockedFD * IndexFile.get_entries_key was renamed to entry_key * IndexEntry instances contained in IndexFile.entries now use binary sha's. Use - the .hexsha property to obtain the hexadecimal version + the .hexsha property to obtain the hexadecimal version. The .sha property + was removed to make the use of the respective sha more explicit. * IndexFile.write_tree: removed missing_ok keyword, its always True now Instead of raising GitCommandError it raises UnmergedEntriesError * diff.Diff.null_hex_sha renamed to NULL_HEX_SHA, to be conforming with -- cgit v1.2.3