add export+import test case
This commit is contained in:
parent
3b412aaae0
commit
8e9713b769
2 changed files with 52 additions and 5 deletions
|
@ -14,13 +14,11 @@ this.
|
|||
importing and resolving the merge conflict, exporting the resolution
|
||||
fails. It seems it's lost the old CID for the remote's content.
|
||||
|
||||
Hmm, can't reproduce that now, I may have been confused?
|
||||
|
||||
* getknowncids should run "updateexportdb exportdb exportdbv",
|
||||
but that leads to a STM deadlock for some reason?
|
||||
|
||||
* Check conflict behavior for both conflicting edits to existing file,
|
||||
and conflicting new files. Note need to check both sequences
|
||||
import,export and export,import.
|
||||
|
||||
* Need to support annex-tracking-branch configuration, which documentation
|
||||
says makes git-annex sync and assistant do imports.
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue