I've just attached a patch-stack as a "testcase" here (not as a fix, but as a testcase to help with reproducing/testing the bug). STR: 1. Import the testcase by doing `moz-phab patch D73533` 2. Update to your new tip (the 'part 3' commit, 'Make two edited copies of the original test file.') 3. Look for `test-file.txt` (e.g. `ls *.txt` or `cat test-file.txt`) ...or, if you prefer, `hg export` your tipmost commit (or look at https://d3kxowhw4s8amj.cloudfront.net/file/data/lk4xjt73ohphe2uaciny/PHID-FILE-itpehrfqbqe62hpzbt73/D73533.diff ) and see what the fate of the original test file was. ACTUAL RESULTS: - The file is missing. - In the `hg export` / above-linked diff view of the tipmost commit, you can see that one of the copy operations somehow became a **rename** operation: ``` diff --git a/test-file.txt b/test-file-3.txt rename from test-file.txt rename to test-file-3.txt --- a/test-file.txt +++ b/test-file-3.txt [...SNIP...] diff --git a/test-file.txt b/test-file-4.txt copy from test-file.txt copy to test-file-4.txt --- a/test-file.txt +++ b/test-file-4.txt ``` EXPECTED RESULTS: The file should have been copied, not renamed. I only did `hg cp` operations when generating this patch stack -- no `hg mv/rename` operations.
Bug 1627405 Comment 9 Edit History
Note: The actual edited comment in the bug view page will always show the original commenter’s name and original timestamp.
I've just attached a patch-stack as a "testcase" here (not as a fix, but as a testcase to help with reproducing/demonstrating the bug). STR: 1. Import the testcase by doing `moz-phab patch D73533` 2. Update to your new tip (the 'part 3' commit, 'Make two edited copies of the original test file.') 3. Look for `test-file.txt` (e.g. `ls *.txt` or `cat test-file.txt`) ...or, if you prefer, `hg export` your tipmost commit (or look at https://d3kxowhw4s8amj.cloudfront.net/file/data/lk4xjt73ohphe2uaciny/PHID-FILE-itpehrfqbqe62hpzbt73/D73533.diff ) and see what the fate of the original test file was. ACTUAL RESULTS: - The file is missing. - In the `hg export` / above-linked diff view of the tipmost commit, you can see that one of the copy operations somehow became a **rename** operation: ``` diff --git a/test-file.txt b/test-file-3.txt rename from test-file.txt rename to test-file-3.txt --- a/test-file.txt +++ b/test-file-3.txt [...SNIP...] diff --git a/test-file.txt b/test-file-4.txt copy from test-file.txt copy to test-file-4.txt --- a/test-file.txt +++ b/test-file-4.txt ``` EXPECTED RESULTS: The file should have been copied, not renamed. I only did `hg cp` operations when generating this patch stack -- no `hg mv/rename` operations.
I've just attached a patch-stack as a "testcase" here (not as a fix, but as a testcase to help with reproducing/demonstrating the bug). STR: 1. Import the testcase by doing `moz-phab patch D73533` 2. Update to your new tip (the 'part 3' commit, 'Make two edited copies of the original test file.') 3. Look for `test-file.txt` (e.g. `ls *.txt` or `cat test-file.txt`) ...or, if you prefer, `hg export` your tipmost commit (or look at https://d3kxowhw4s8amj.cloudfront.net/file/data/lk4xjt73ohphe2uaciny/PHID-FILE-itpehrfqbqe62hpzbt73/D73533.diff ) and see what the fate of the original test file was. ACTUAL RESULTS: - The file is missing. - In the `hg export` / above-linked diff view of the tipmost commit, you can see that one of the copy operations somehow became a **rename** operation: ``` diff --git a/test-file.txt b/test-file-3.txt rename from test-file.txt rename to test-file-3.txt --- a/test-file.txt +++ b/test-file-3.txt [...SNIP...] diff --git a/test-file.txt b/test-file-4.txt copy from test-file.txt copy to test-file-4.txt --- a/test-file.txt +++ b/test-file-4.txt ``` EXPECTED RESULTS: The file should have been copied, not renamed. I only did `hg cp` operations when generating this patch stack -- no `hg mv/rename` operations. Note: I'm using MozPhab (0.1.85), which seems to be the latest available.