add test case for sync_in_adjusted_branch_deleted_recently_added_files
This commit was sponsored by Denis Dzyubenko on Patreon.
This commit is contained in:
parent
d7a88e3510
commit
66ebf1a8f9
2 changed files with 32 additions and 2 deletions
|
@ -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]]
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue