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

add test: conflict resolution (mixed locked and unlocked file)

Browse source
This commit is contained in:
Joey Hess 2015-12-30 16:36:39 -04:00
parent eff33d33f0
commit 4be2b57606
Failed to extract signature
2 changed files with 39 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
doc/todo/smudge.mdwn
View file

@ -3,8 +3,6 @@ git-annex should use smudge/clean filters.
### implementation todo list
* Test suite:
- 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: