diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-03-04 01:58:09 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-03-04 02:03:15 -0400 |
| commit | cfe87407f493e428ca8e1d5592b228675199afb3 (patch) | |
| tree | 260e68fab396ba20c515a31a7ad8a88e2bcf3aeb /debian | |
| parent | 0ba6b3aa7d3a7528ba95ffbae7df6634adbed9b6 (diff) | |
finish fixing direct mode merge bug involving unstaged local files
Added test cases for both ways this can happen, with a conflict involving a
file, or a directory.
Cleaned up resolveMerge to not touch the work tree in direct mode, which
turned out to be the only way to handle things.. And makes it much nicer.
Still need to run test suite on windows.
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index 0807c1c6d..73dd55ffb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ git-annex (5.20140228) UNRELEASED; urgency=medium - * sync: Fix bug in direct mode that caused a file not checked into git - to be deleted when merging with a remote that added a file by the same - name. + * sync: Fix bug in direct mode that caused a file that was not + checked into git to be deleted when there was a conflicting + merge with a remote. * webapp: Now supports HTTPS. * webapp: No longer supports a port specified after --listen, since it was buggy, and that use case is better supported by setting up HTTPS. |