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

test suite 100% pass in v6, finally!

Browse source 
Set annex.largefiles when adding the conflicting non-annexed file,
otherwise it would be added as an annexed file.
This commit is contained in:
Joey Hess 2015-12-30 15:12:27 -04:00
parent 829ae91009
commit 0b8bba8031
Failed to extract signature
2 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
doc/todo/smudge.mdwn
View file

@ -3,11 +3,9 @@ git-annex should use smudge/clean filters.
### implementation todo list
* Test suite:
Next "needs to be done" is to work on the test suite some more for v6
repositories. Need to add a test for how it resolves a conflict between
an unlocked and a locked file that point to the same key. Need to add
another pass through all the tests with files being unlocked. And need to
fix the two remaining test failures.
- add a test for how it resolves a conflict between
an unlocked and a locked file that point to the same key.
- add another pass through all the tests with files being unlocked in v6 mode
* Reconcile staged changes into the associated files database, whenever
the database is queried. This is needed to handle eg:
git add largefile