# Construct the following history tree:

#

# @  5:e1bb631146ca  b1

# |

# o  4:a4fdb3b883c4 0:b608b9236435  b1

# |

# | o  3:4b57d2520816 1:44592833ba9f

# | |

# | | o  2:063f31070f65

# | |/

# | o  1:44592833ba9f

# |/

# o  0:b608b9236435

  $ mkdir b1

  $ cd b1

  $ hg init

  $ echo foo > foo

  $ echo zero > a

  $ hg init sub

  $ echo suba > sub/suba

  $ hg --cwd sub ci -Am addsuba

  adding suba

  $ echo 'sub = sub' > .hgsub

  $ hg ci -qAm0

  $ echo one > a ; hg ci -m1

  $ echo two > a ; hg ci -m2

  $ hg up -q 1

  $ echo three > a ; hg ci -qm3

  $ hg up -q 0

  $ hg branch -q b1

  $ echo four > a ; hg ci -qm4

  $ echo five > a ; hg ci -qm5

Initial repo state:

  $ hg log -G --template '{rev}:{node|short} {parents} {branches}\n'

  @  5:ff252e8273df  b1

  |

  o  4:d047485b3896 0:60829823a42a  b1

  |

  | o  3:6efa171f091b 1:0786582aa4b1

  | |

  | | o  2:bd10386d478c

  | |/

  | o  1:0786582aa4b1

  |/

  o  0:60829823a42a

Make sure update doesn't assume b1 is a repository if invoked from outside:

  $ cd ..

  $ hg update b1

  abort: no repository found in '$TESTTMP' (.hg not found)!

  [255]

  $ cd b1

Test helper functions:

  $ revtest () {

  >     msg=$1

  >     dirtyflag=$2   # 'clean', 'dirty' or 'dirtysub'

  >     startrev=$3

  >     targetrev=$4

  >     opt=$5

  >     hg up -qC $startrev

  >     test $dirtyflag = dirty && echo dirty > foo

  >     test $dirtyflag = dirtysub && echo dirty > sub/suba

  >     hg up $opt $targetrev

  >     hg parent --template 'parent={rev}\n'

  >     hg stat -S

  > }

  $ norevtest () {

  >     msg=$1

  >     dirtyflag=$2   # 'clean', 'dirty' or 'dirtysub'

  >     startrev=$3

  >     opt=$4

  >     hg up -qC $startrev

  >     test $dirtyflag = dirty && echo dirty > foo

  >     test $dirtyflag = dirtysub && echo dirty > sub/suba

  >     hg up $opt

  >     hg parent --template 'parent={rev}\n'

  >     hg stat -S

  > }

Test cases are documented in a table in the update function of merge.py.

Cases are run as shown in that table, row by row.

  $ norevtest 'none clean linear' clean 4

  1 files updated, 0 files merged, 0 files removed, 0 files unresolved

  parent=5

  $ norevtest 'none clean same'   clean 2

  0 files updated, 0 files merged, 0 files removed, 0 files unresolved

  1 other heads for branch "default"

  parent=2

  $ revtest 'none clean linear' clean 1 2

  1 files updated, 0 files merged, 0 files removed, 0 files unresolved

  parent=2

  $ revtest 'none clean same'   clean 2 3

  1 files updated, 0 files merged, 0 files removed, 0 files unresolved

  parent=3

  $ revtest 'none clean cross'  clean 3 4

  1 files updated, 0 files merged, 0 files removed, 0 files unresolved

  parent=4

  $ 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 dirtysub linear' dirtysub 1 2

  1 files updated, 0 files merged, 0 files removed, 0 files unresolved

  parent=2

  M sub/suba

  $ revtest 'none dirty same'   dirty 2 3

  abort: uncommitted changes

  (commit or update --clean to discard changes)

  parent=2

  M foo

  $ revtest 'none dirtysub same'   dirtysub 2 3

  abort: uncommitted changes

  (commit or update --clean to discard changes)

  parent=2

  M sub/suba

  $ revtest 'none dirty cross'  dirty 3 4

  abort: uncommitted changes

  (commit or update --clean to discard changes)

  parent=3

  M foo

  $ norevtest 'none dirty cross'  dirty 2

  0 files updated, 0 files merged, 0 files removed, 0 files unresolved

  1 other heads for branch "default"

  parent=2

  M foo

  $ revtest 'none dirtysub cross'  dirtysub 3 4

  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

  1 other heads for branch "default"

  parent=2

  $ revtest '-cC dirty linear'  dirty 1 2 -cC

  abort: can only specify one of -C/--clean, -c/--check, or -m/merge

  parent=1

  M foo

  $ revtest '-mc dirty linear'  dirty 1 2 -mc

  abort: can only specify one of -C/--clean, -c/--check, or -m/merge

  parent=1

  M foo

  $ revtest '-mC dirty linear'  dirty 1 2 -mC

  abort: can only specify one of -C/--clean, -c/--check, or -m/merge

  parent=1

  M foo

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

  $ echo 'updatecheck = abort' >> .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 'updatecheck = none' >> .hg/hgrc

  $ revtest 'none dirty cross'  dirty 3 4

  1 files updated, 0 files merged, 0 files removed, 0 files unresolved

  parent=4

  M foo

  $ 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

  $ hg co --tool :merge3 4

  merging a

  warning: conflicts while merging a! (edit, then use 'hg resolve --mark')

  0 files updated, 0 files merged, 0 files removed, 1 files unresolved

  use 'hg resolve' to retry unresolved file merges

  [1]

  $ hg st

  M a

  ? a.orig

  $ cat a

  <<<<<<< working copy: 6efa171f091b - test: 3

  three

  dirty

  ||||||| base

  three

  =======

  four

  >>>>>>> destination:  d047485b3896 b1 - test: 4

  $ rm a.orig

  $ echo 'updatecheck = noconflict' >> .hg/hgrc

  $ revtest 'none dirty cross'  dirty 3 4

  1 files updated, 0 files merged, 0 files removed, 0 files unresolved

  parent=4

  M foo

  $ 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

Locally added file is allowed

  $ hg up -qC 3

  $ echo a > bar

  $ hg add bar

  $ hg up -q 4

  $ hg st

  A bar

  $ hg forget bar

  $ rm bar

Locally removed file is allowed

  $ hg up -qC 3

  $ hg rm foo

  $ hg up -q 4

File conflict is not allowed

  $ hg up -qC 3

  $ echo dirty >> a

  $ hg up -q 4

  abort: conflicting changes

  (commit or update --clean to discard changes)

  [255]

  $ hg up -m 4

  merging a

  warning: conflicts while merging a! (edit, then use 'hg resolve --mark')

  0 files updated, 0 files merged, 0 files removed, 1 files unresolved

  use 'hg resolve' to retry unresolved file merges

  [1]

  $ rm a.orig

Change/delete conflict is not allowed

  $ hg up -qC 3

  $ hg rm foo

  $ hg up -q 4

Uses default value of "linear" when value is misspelled

  $ echo 'updatecheck = linyar' >> .hg/hgrc

  $ revtest 'dirty cross'  dirty 3 4

  abort: uncommitted changes

  (commit or update --clean to discard changes)

  parent=3

  M foo

Setup for later tests

  $ revtest 'none dirty linear' dirty 1 2 -c

  abort: uncommitted changes

  parent=1

  M foo

  $ cd ..

Test updating to null revision

  $ hg init null-repo

  $ cd null-repo

  $ echo a > a

  $ hg add a

  $ hg ci -m a

  $ hg up -qC 0

  $ echo b > b

  $ hg add b

  $ hg up null

  0 files updated, 0 files merged, 1 files removed, 0 files unresolved

  $ hg st

  A b

  $ hg up -q 0

  $ hg st

  A b

  $ hg up -qC null

  $ hg st

  ? b

  $ cd ..

Test updating with closed head

---------------------------------------------------------------------

  $ hg clone -U -q b1 closed-heads

  $ cd closed-heads

Test updating if at least one non-closed branch head exists

if on the closed branch head:

- update to "."

- "updated to a closed branch head ...." message is displayed

- "N other heads for ...." message is displayed

  $ hg update -q -C 3

  $ hg commit --close-branch -m 6

  $ norevtest "on closed branch head" clean 6

  0 files updated, 0 files merged, 0 files removed, 0 files unresolved

  no open descendant heads on branch "default", updating to a closed head

  (committing will reopen the head, use 'hg heads .' to see 1 other heads)

  parent=6

if descendant non-closed branch head exists, and it is only one branch head:

- update to it, even if its revision is less than closed one

- "N other heads for ...." message isn't displayed

  $ norevtest "non-closed 2 should be chosen" clean 1

  1 files updated, 0 files merged, 0 files removed, 0 files unresolved

  parent=2

if all descendant branch heads are closed, but there is another branch head:

- update to the tipmost descendant head

- "updated to a closed branch head ...." message is displayed

- "N other heads for ...." message is displayed

  $ norevtest "all descendant branch heads are closed" clean 3

  0 files updated, 0 files merged, 0 files removed, 0 files unresolved

  no open descendant heads on branch "default", updating to a closed head

  (committing will reopen the head, use 'hg heads .' to see 1 other heads)

  parent=6

Test updating if all branch heads are closed

if on the closed branch head:

- update to "."

- "updated to a closed branch head ...." message is displayed

- "all heads of branch ...." message is displayed

  $ hg update -q -C 2

  $ hg commit --close-branch -m 7

  $ norevtest "all heads of branch default are closed" clean 6

  0 files updated, 0 files merged, 0 files removed, 0 files unresolved

  no open descendant heads on branch "default", updating to a closed head

  (committing will reopen branch "default")

  parent=6

if not on the closed branch head:

- update to the tipmost descendant (closed) head

- "updated to a closed branch head ...." message is displayed

- "all heads of branch ...." message is displayed

  $ norevtest "all heads of branch default are closed" clean 1

  1 files updated, 0 files merged, 0 files removed, 0 files unresolved

  no open descendant heads on branch "default", updating to a closed head

  (committing will reopen branch "default")

  parent=7

  $ cd ..

Test updating if "default" branch doesn't exist and no revision is

checked out (= "default" is used as current branch)

  $ hg init no-default-branch

  $ cd no-default-branch