comparison tests/test-update-branches.t @ 48405:acdd4a42deaa

update: use long version of the flag in the test

This helps readability and searchability.

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

48404:0ad593b60760

  abort: uncommitted changes
  (commit or update --clean to discard changes)
  parent=3
  M sub/suba

  $ revtest '-C dirty linear'   dirty 1 2 -C
  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
  parent=2

  $ revtest '-c dirty linear'   dirty 1 2 -c
  abort: uncommitted changes
  parent=1
  M foo

  $ revtest '-m dirty linear'   dirty 1 2 -m
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  parent=2
  M foo

  $ revtest '-m dirty cross'  dirty 3 4 -m
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  parent=4
  M foo

  $ revtest '-c dirtysub linear'   dirtysub 1 2 -c
  abort: uncommitted changes in subrepository "sub"
  parent=1
  M sub/suba

  $ norevtest '-c clean same'   clean 2 -c
  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
  updated to "bd10386d478c: 2"
  1 other heads for branch "default"
  parent=2

  $ revtest '-cC dirty linear'  dirty 1 2 -cC
  abort: cannot specify both --clean and --check
  parent=1
  M foo

  $ revtest '-mc dirty linear'  dirty 1 2 -mc
  abort: cannot specify both --check and --merge
  parent=1
  M foo

  $ revtest '-mC dirty linear'  dirty 1 2 -mC
  abort: cannot specify both --clean and --merge
  parent=1
  M foo

  $ echo '[commands]' >> .hg/hgrc

  $ revtest 'none dirty linear' dirty 1 2
  abort: uncommitted changes
  parent=1
  M foo

  $ revtest 'none dirty linear' dirty 1 2 -c
  abort: uncommitted changes
  parent=1
  M foo

  $ revtest 'none dirty linear' dirty 1 2 -C
  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
  parent=2

  $ echo 'update.check = none' >> .hg/hgrc

  $ revtest 'none dirty linear' dirty 1 2
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  parent=2
  M foo

  $ revtest 'none dirty linear' dirty 1 2 -c
  abort: uncommitted changes
  parent=1
  M foo

  $ revtest 'none dirty linear' dirty 1 2 -C
  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
  parent=2

  $ hg co -qC 3
  $ echo dirty >> a

48405:acdd4a42deaa

  abort: uncommitted changes
  (commit or update --clean to discard changes)
  parent=3
  M sub/suba

  $ revtest '--clean dirty linear'   dirty 1 2 --clean
  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
  parent=2

  $ revtest '--check dirty linear'   dirty 1 2 --check
  abort: uncommitted changes
  parent=1
  M foo

  $ revtest '--merge dirty linear'   dirty 1 2 --merge
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  parent=2
  M foo

  $ revtest '--merge dirty cross'  dirty 3 4 --merge
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  parent=4
  M foo

  $ revtest '--check dirtysub linear'   dirtysub 1 2 --check
  abort: uncommitted changes in subrepository "sub"
  parent=1
  M sub/suba

  $ norevtest '--check clean same'   clean 2 -c
  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
  updated to "bd10386d478c: 2"
  1 other heads for branch "default"
  parent=2

  $ revtest '--check --clean dirty linear'  dirty 1 2 "--check --clean"
  abort: cannot specify both --clean and --check
  parent=1
  M foo

  $ revtest '--merge -checkc dirty linear'  dirty 1 2 "--merge --check"
  abort: cannot specify both --check and --merge
  parent=1
  M foo

  $ revtest '--merge -clean dirty linear'  dirty 1 2 "--merge --clean"
  abort: cannot specify both --clean and --merge
  parent=1
  M foo

  $ echo '[commands]' >> .hg/hgrc

  $ revtest 'none dirty linear' dirty 1 2
  abort: uncommitted changes
  parent=1
  M foo

  $ revtest 'none dirty linear' dirty 1 2 --check
  abort: uncommitted changes
  parent=1
  M foo

  $ revtest '--merge none dirty linear' dirty 1 2 --check
  abort: uncommitted changes
  parent=1
  M foo

  $ revtest 'none dirty linear' dirty 1 2 --clean
  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
  parent=2

  $ echo 'update.check = none' >> .hg/hgrc

  $ revtest 'none dirty linear' dirty 1 2
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  parent=2
  M foo

  $ revtest 'none dirty linear' dirty 1 2 --check
  abort: uncommitted changes
  parent=1
  M foo

  $ revtest 'none dirty linear' dirty 1 2 --clean
  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
  parent=2

  $ hg co -qC 3
  $ echo dirty >> a