view tests/test-merge5.t @ 42920:a50661567f83

uncommit: drop the hyphen from --current-user and --current-date

I didn't pay enough attention to these long forms- graft, amend and MQ already
use the old style naming.  It's probably more important to be consistent than
modern.  The hypenated style came from evolve.

Yuya mentioned this naming discrepancy in 4145fd3569c3, but it didn't attract
any discussion[1].  There's also a bit of inconsistency in that the default
parameter for `currentdate` is `False` for graft, and `None` for the rest.

[1] https://www.mercurial-scm.org/pipermail/mercurial-devel/2019-January/126767.html

Differential Revision: https://phab.mercurial-scm.org/D6841

  $ hg init
  $ echo This is file a1 > a
  $ echo This is file b1 > b
  $ hg add a b
  $ hg commit -m "commit #0"
  $ echo This is file b22 > b
  $ hg commit -m "comment #1"
  $ hg update 0
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  $ rm b
  $ hg commit -A -m "comment #2"
  removing b
  created new head
  $ hg update 1
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  $ rm b
  $ hg update -c 2
  abort: uncommitted changes
  [255]
  $ hg revert b
  $ hg update -c 2
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
  $ mv a c

Should abort:

  $ hg update 1
  abort: uncommitted changes
  (commit or update --clean to discard changes)
  [255]
  $ mv c a

Should succeed:

  $ hg update 1
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved