From patchwork Tue Feb 14 01:07:21 2017
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [4,of,6] update: show -C and -c as mutually exclusive in synopsis
From: via Mercurial-devel <mercurial-devel@mercurial-scm.org>
X-Patchwork-Id: 18463
Message-Id: <59e2d3da607cc09ebe13.1487034441@martinvonz.mtv.corp.google.com>
To: mercurial-devel@mercurial-scm.org
Date: Mon, 13 Feb 2017 17:07:21 -0800

# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 1487027086 28800
#      Mon Feb 13 15:04:46 2017 -0800
# Node ID 59e2d3da607cc09ebe133ab199fc4f343d74e1e6
# Parent  4c11837859ce08ad07d09a544aa89e3e930499c3
update: show -C and -c as mutually exclusive in synopsis

Also reorder them to match the flag table.

diff -r 4c11837859ce -r 59e2d3da607c mercurial/commands.py
--- a/mercurial/commands.py	Mon Feb 13 11:58:02 2017 -0800
+++ b/mercurial/commands.py	Mon Feb 13 15:04:46 2017 -0800
@@ -6474,7 +6474,7 @@
     ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
     ('r', 'rev', '', _('revision'), _('REV'))
      ] + mergetoolopts,
-    _('[-c] [-C] [-d DATE] [[-r] REV]'))
+    _('[-C|-c] [-d DATE] [[-r] REV]'))
 def update(ui, repo, node=None, rev=None, clean=False, date=None, check=False,
            tool=None):
     """update working directory (or switch revisions)