always find optimal merge
Testing b9ac585454
, it didn't find the
optimal union merge, the second sha was the one to use, at least in
the case I tried. Let's just try all shas to see if any can be reused.
I stopped using the expensive nub, so despite the use of sets to
sort/uniq file contents, this is probably as fast or faster than it
was before.
This commit is contained in:
parent
0cbab5de65
commit
acd7a52dfd
2 changed files with 26 additions and 14 deletions
6
debian/changelog
vendored
6
debian/changelog
vendored
|
@ -1,3 +1,9 @@
|
|||
git-annex (3.20111212) UNRELEASED; urgency=low
|
||||
|
||||
* Union merge now finds the least expensive way to represent the merge.
|
||||
|
||||
-- Joey Hess <joeyh@debian.org> Mon, 12 Dec 2011 01:57:49 -0400
|
||||
|
||||
git-annex (3.20111211) unstable; urgency=medium
|
||||
|
||||
* Fix bug in last version in getting contents from bare repositories.
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue