| Submitter | Pulkit Goyal |
|---|---|
| Date | Jan. 18, 2017, 1:15 p.m. |
| Message ID | <96526ae813742f2e230b.1484745310@pulkit-goyal> |
| Download | mbox | patch |
| Permalink | /patch/18244/ |
| State | Accepted |
| Headers | show |
Comments
As you may have seen in the email from "Mercurial Commits", this was queued as 64a9160b, thanks. On Wed, Jan 18, 2017 at 5:15 AM, Pulkit Goyal <7895pulkit@gmail.com> wrote: > # HG changeset patch > # User Pulkit Goyal <7895pulkit@gmail.com> > # Date 1484691259 -19800 > # Wed Jan 18 03:44:19 2017 +0530 > # Node ID 96526ae813742f2e230beb243a8317eb80cd5e16 > # Parent 08b34c3a6f74800b5b357f371568177827963e2b > help: update help for `hg update` which was misleading (bug5427) > > diff -r 08b34c3a6f74 -r 96526ae81374 mercurial/commands.py > --- a/mercurial/commands.py Tue Jan 17 11:25:02 2017 -0800 > +++ b/mercurial/commands.py Wed Jan 18 03:44:19 2017 +0530 > @@ -6481,10 +6481,10 @@ > changeset (see :hg:`help parents`). > > If the changeset is not a descendant or ancestor of the working > - directory's parent, the update is aborted. With the -c/--check > - option, the working directory is checked for uncommitted changes; if > - none are found, the working directory is updated to the specified > - changeset. > + directory's parent and there are uncommitted changes, the update is > + aborted. With the -c/--check option, the working directory is checked > + for uncommitted changes; if none are found, the working directory is > + updated to the specified changeset. > > .. container:: verbose > > _______________________________________________ > Mercurial-devel mailing list > Mercurial-devel@mercurial-scm.org > https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
Patch
diff -r 08b34c3a6f74 -r 96526ae81374 mercurial/commands.py --- a/mercurial/commands.py Tue Jan 17 11:25:02 2017 -0800 +++ b/mercurial/commands.py Wed Jan 18 03:44:19 2017 +0530 @@ -6481,10 +6481,10 @@ changeset (see :hg:`help parents`). If the changeset is not a descendant or ancestor of the working - directory's parent, the update is aborted. With the -c/--check - option, the working directory is checked for uncommitted changes; if - none are found, the working directory is updated to the specified - changeset. + directory's parent and there are uncommitted changes, the update is + aborted. With the -c/--check option, the working directory is checked + for uncommitted changes; if none are found, the working directory is + updated to the specified changeset. .. container:: verbose