diff options
Diffstat (limited to 'doc/bugs/sync_in_adjusted_branch_deleted_recently_added_files.mdwn')
| -rw-r--r-- | doc/bugs/sync_in_adjusted_branch_deleted_recently_added_files.mdwn | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/doc/bugs/sync_in_adjusted_branch_deleted_recently_added_files.mdwn b/doc/bugs/sync_in_adjusted_branch_deleted_recently_added_files.mdwn index ce271d8dd..4681cbe48 100644 --- a/doc/bugs/sync_in_adjusted_branch_deleted_recently_added_files.mdwn +++ b/doc/bugs/sync_in_adjusted_branch_deleted_recently_added_files.mdwn @@ -64,8 +64,7 @@ tree items, but it can forget that it needed to modify the tree, which prevents the change from propigating up from the subtree to the root, and so it gets left out of the reverse adjusted commit. -I'm committing a fix, but this needs a test case. Leaving bug open for -that. +I'm committing a fix. With the fix, when I git annex sync in felix's tree, the files that were getting wrongly deleted are added. The commit summary shows @@ -77,4 +76,13 @@ This seems wrong. I think this is a separate bug that was hidden by the other one, it's grafting in files using their whole path, to a subtree that is itself part way down that path. +--- + +A simpler case of the both bugs is to have a file like a/b/c/d already +committed and make a commit that adds a/b/x/y, without otherwise modifying +that tree. On an adjusted branch, `git annex sync` makes a commit of a tree +that does not include the new file. It may made a commit on top of it for +the adjusted branch that adds the file back, but the file doesn't reach +the master branch in this scenario. + --[[Joey]] |