diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-10-11 15:36:40 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-10-11 15:36:40 -0400 |
| commit | 7c5f9aacb1a6abd1437297889bb67a40f88e6f4a (patch) | |
| tree | a693bcd7aeb4b7c888cd41a463e9704ca0ccbcb4 /doc/bugs/sync_in_adjusted_branch_deleted_recently_added_files.mdwn | |
| parent | ce72696171a0bf212dfc8f40a5c6b875bf7e7692 (diff) | |
fix tree graft-in bug
When adding a tree like a/b/c/d when a/b already exists, fixes the bug that
the tree that got created was a/b/a/b/c/d
Just need to flatten out the top N directories of the tree that's being
grafted in, so we get the c/d part. This was complicated by the Tree
data type being a rose tree rather than a regular tree.
This commit was sponsored by Nick Daly on Patreon.
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 | 2 |
1 files changed, 2 insertions, 0 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 4681cbe48..6c82fcf82 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 @@ -86,3 +86,5 @@ the adjusted branch that adds the file back, but the file doesn't reach the master branch in this scenario. --[[Joey]] + +Both bugs fixed now. [[done]] --[[Joey]] |