diff options
| author | Sebastian Thiel <byronimo@gmail.com> | 2010-06-24 16:02:28 +0200 |
|---|---|---|
| committer | Sebastian Thiel <byronimo@gmail.com> | 2010-06-24 18:08:40 +0200 |
| commit | 55dcc17c331f580b3beeb4d5decf64d3baf94f2e (patch) | |
| tree | 9b22eac76156f87e307ea33294791bc820fd3167 /CHANGES | |
| parent | 129f90aa8d83d9b250c87b0ba790605c4a2bb06a (diff) | |
| download | gitpython-55dcc17c331f580b3beeb4d5decf64d3baf94f2e.tar.gz | |
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
Diffstat (limited to 'CHANGES')
| -rw-r--r-- | CHANGES | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -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 |