Git import: a moved file ends up with two nodes at one path after a merge issue #30
closed: completed andymccall opened this · 0 comments
andymccall
Found by P5c on microsoft/vscode. Importing the first 1 747 commits (to merge 0babb4299131, PR #1217) leaves src/vs/workbench/api/node/extHostLanguageFeatures.ts as a name conflict (two nodes at one path; the checkout has it as .oxy-conflict-1). oxy git verify reports it on every later commit until the path changes (51 differences in the first 1 766). Git records the file as added in 81456a72 ('move api/common to api/browser'), really a move from api/common. The same result comes from builds without deterministic node ids and without the unchanged-file shortcut, so it predates today's changes. Reproduce on Earth: ~/bench, branch slicebad of vscode.git. Next: find which change adds the second node (rename detection turning the move into a Move on one path while the merge's other parent brings an Add?), then fix and add a small test.
Found by P5c on microsoft/vscode. Importing the first 1 747 commits (to merge 0babb4299131, PR #1217) leaves src/vs/workbench/api/node/extHostLanguageFeatures.ts as a name conflict (two nodes at one path; the checkout has it as .oxy-conflict-1). oxy git verify reports it on every later commit until the path changes (51 differences in the first 1 766). Git records the file as added in 81456a72 ('move api/common to api/browser'), really a move from api/common. The same result comes from builds without deterministic node ids and without the unchanged-file shortcut, so it predates today's changes. Reproduce on Earth: ~/bench, branch slicebad of vscode.git. Next: find which change adds the second node (rename detection turning the move into a Move on one path while the merge's other parent brings an Add?), then fix and add a small test.