diff --git a/src/applications/conduit/method/conduit/connect/ConduitAPI_conduit_connect_Method.php b/src/applications/conduit/method/conduit/connect/ConduitAPI_conduit_connect_Method.php index 3d2a7ff9a4..dfa88b2273 100644 --- a/src/applications/conduit/method/conduit/connect/ConduitAPI_conduit_connect_Method.php +++ b/src/applications/conduit/method/conduit/connect/ConduitAPI_conduit_connect_Method.php @@ -86,7 +86,7 @@ final class ConduitAPI_conduit_connect_Method extends ConduitAPIMethod { switch ($client) { case 'arc': - $server_version = 3; + $server_version = 4; switch ($client_version) { case $server_version: break; diff --git a/src/applications/differential/field/specification/base/DifferentialFieldSpecification.php b/src/applications/differential/field/specification/base/DifferentialFieldSpecification.php index 7237c9b1e3..9d47c9c57d 100644 --- a/src/applications/differential/field/specification/base/DifferentialFieldSpecification.php +++ b/src/applications/differential/field/specification/base/DifferentialFieldSpecification.php @@ -431,6 +431,8 @@ abstract class DifferentialFieldSpecification { * message, return true. If the authoritative value should always be used, * return false. By default, fields can not be overwritten. * + * arc will only attempt to overwrite field values if run with "--verbatim". + * * @return bool True to indicate the field is save to overwrite. * @task commit */ diff --git a/src/applications/differential/field/specification/revisionid/DifferentialRevisionIDFieldSpecification.php b/src/applications/differential/field/specification/revisionid/DifferentialRevisionIDFieldSpecification.php index 9d451b1252..96e8c956ce 100644 --- a/src/applications/differential/field/specification/revisionid/DifferentialRevisionIDFieldSpecification.php +++ b/src/applications/differential/field/specification/revisionid/DifferentialRevisionIDFieldSpecification.php @@ -47,7 +47,7 @@ final class DifferentialRevisionIDFieldSpecification } public function renderValueForCommitMessage($is_edit) { - if ($is_edit || !$this->id) { + if (!$this->id) { return null; } return PhabricatorEnv::getProductionURI('/D'.$this->id);