mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

finish fixing direct mode merge bug involving unstaged local files

Browse source 
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.
This commit is contained in:
Joey Hess 2014-03-04 01:58:09 -04:00
parent 19475fd0ab
commit 4a847cdc08
4 changed files with 92 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

6
debian/changelog vendored
View file

@ -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.