diff --git a/src/applications/differential/controller/DifferentialChangesetViewController.php b/src/applications/differential/controller/DifferentialChangesetViewController.php --- a/src/applications/differential/controller/DifferentialChangesetViewController.php +++ b/src/applications/differential/controller/DifferentialChangesetViewController.php @@ -110,10 +110,13 @@ if ($left) { $left_data = $left->makeNewFile(); + $left_properties = $left->getNewProperties(); if ($right) { $right_data = $right->makeNewFile(); + $right_properties = $right->getNewProperties(); } else { $right_data = $left->makeOldFile(); + $right_properties = $left->getOldProperties(); } $engine = new PhabricatorDifferenceEngine(); @@ -124,6 +127,9 @@ $choice = clone nonempty($left, $right); $choice->attachHunks($synthetic->getHunks()); + $choice->setOldProperties($left_properties); + $choice->setNewProperties($right_properties); + $changeset = $choice; }