DIFF: Wrong history on arc land --merge

Reproduction Instructions

  • take any file
  • add one line and write //
  • commit test1
  • arc diff
  • go back to the file add something after // -> //this test is going to fail
  • commit test2
  • arc diff
  • arc land --merge -> accept to land without revisions
  • Go to the revision page. -> This is already wrong, the code diff shows only //
  • Select history tab
  • Select the diff between test2 and the last commit (auto generated)
  • The code diff will show the content of test2 being removed. Note: in the commits the data is there.

Phabricator/Arcanist Version
on the server
c4b4a53cad7722f031b725f8b41511e9d341d033 (Fri, Dec 13)
bac2028421a4be6e34e08764bbbda49e68b3a604 (Tue, Nov 19)
1750586fdc50a6cd98adba4aa2f5a7649bd91dbe (Sep 30 2019)

on my pc
arcanist bac2028421a4be6e34e08764bbbda49e68b3a604 (19 Nov 2019)
libphutil 1750586fdc50a6cd98adba4aa2f5a7649bd91dbe (30 Sep 2019)

1 Like