diff options
| author |  Joey Hess <joey@kitenet.net> | 2011-12-12 01:33:02 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-12-12 01:59:29 -0400 |
| commit | acd7a52dfd2cad24fd946ffcf8c4b1d07eb474ce (patch) | |
| tree | 7a93b0f04d270fcc479ec89ff68eed6430270dc2 /debian | |
| parent | 0cbab5de657e025057dd10b087a874d6b3a7b13e (diff) | |
always find optimal merge
Testing b9ac5854549636493449fea6830364a01159fbf6, 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.
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index b676c3c3d..db23decbb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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. |