Tests for change/delete conflicts, including:

b5605d88dc27: Make ui.prompt repeat on "unrecognized response" again

 (issue897)

840e2b315c1f: Fix misleading error and prompts during update/merge

 (issue556)

Make sure HGMERGE doesn't interfere with the test

  $ unset HGMERGE

  $ status() {

  >     echo "--- status ---"

  >     hg st -A file1 file2 file3

  >     echo "--- resolve --list ---"

  >     hg resolve --list file1 file2 file3

  >     echo "--- debugmergestate ---"

  >     hg debugmergestate

  >     for file in file1 file2 file3; do

  >         if [ -f $file ]; then

  >             echo "--- $file ---"

  >             cat $file

  >         else

  >             echo "*** $file does not exist"

  >         fi

  >     done

  > }

  $ hg init repo

  $ cd repo

  $ echo 1 > file1

  $ echo 2 > file2

  $ echo 3 > file3

  $ hg ci -Am 'added files'

  adding file1

  adding file2

  adding file3

  $ hg rm file1

  $ echo changed >> file2

  $ echo changed1 >> file3

  $ hg ci -m 'removed file1, changed file2, changed file3'

  $ hg co 0

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

  $ echo changed >> file1

  $ hg rm file2

  $ echo changed2 >> file3

  $ hg ci -m 'changed file1, removed file2, changed file3'

  created new head

Non-interactive merge:

  $ hg merge -y

  file 'file1' was deleted in other [merge rev] but was modified in local [working copy].

  You can use (c)hanged version, (d)elete, or leave (u)nresolved.

  What do you want to do? u

  file 'file2' was deleted in local [working copy] but was modified in other [merge rev].

  You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.

  What do you want to do? u

  merging file3

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

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

  use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon

  [1]

  $ status

  --- status ---

  M file2

  M file3

  C file1

  --- resolve --list ---

  U file1

  U file2

  U file3

  --- debugmergestate ---

  local (working copy): 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4

  other (merge rev): 10f9a0a634e82080907e62f075ab119cbc565ea6

  file: file1 (state "u")

    local path: file1 (hash 60b27f004e454aca81b0480209cce5081ec52390, flags "")

    ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be)

    other path: file1 (node 0000000000000000000000000000000000000000)

    extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff

  file: file2 (state "u")

    local path: file2 (hash 0000000000000000000000000000000000000000, flags "")

    ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e)

    other path: file2 (node e7c1328648519852e723de86c0c0525acd779257)

    extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff

  file: file3 (state "u")

    local path: file3 (hash d5b0a58bc47161b1b8a831084b366f757c4f0b11, flags "")

    ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4)

    other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb)

    extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff

  --- file1 ---

  1

  changed

  --- file2 ---

  2

  changed

  --- file3 ---

  3

  <<<<<<< working copy: 13910f48cf7b - test: changed file1, removed file2, chan...

  changed2

  =======

  changed1

  >>>>>>> merge rev:    10f9a0a634e8 - test: removed file1, changed file2, chan...

Interactive merge:

  $ hg co -C

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

  updated to "13910f48cf7b: changed file1, removed file2, changed file3"

  1 other heads for branch "default"

  $ hg merge --config ui.interactive=true <<EOF

  > c

  > d

  > EOF

  file 'file1' was deleted in other [merge rev] but was modified in local [working copy].

  You can use (c)hanged version, (d)elete, or leave (u)nresolved.

  What do you want to do? c

  file 'file2' was deleted in local [working copy] but was modified in other [merge rev].

  You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.

  What do you want to do? d

  merging file3

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

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

  use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon

  [1]

  $ status

  --- status ---

  file2: * (glob)

  M file3

  C file1

  --- resolve --list ---

  R file1

  R file2

  U file3

  --- debugmergestate ---

  local (working copy): 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4

  other (merge rev): 10f9a0a634e82080907e62f075ab119cbc565ea6

  file: file1 (state "r")

    local path: file1 (hash 60b27f004e454aca81b0480209cce5081ec52390, flags "")

    ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be)

    other path: file1 (node 0000000000000000000000000000000000000000)

    extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff

  file: file2 (state "r")

    local path: file2 (hash 0000000000000000000000000000000000000000, flags "")

    ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e)

    other path: file2 (node e7c1328648519852e723de86c0c0525acd779257)

    extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff

  file: file3 (state "u")

    local path: file3 (hash d5b0a58bc47161b1b8a831084b366f757c4f0b11, flags "")

    ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4)

    other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb)

    extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff

  --- file1 ---

  1

  changed

  *** file2 does not exist

  --- file3 ---

  3

  <<<<<<< working copy: 13910f48cf7b - test: changed file1, removed file2, chan...

  changed2

  =======

  changed1

  >>>>>>> merge rev:    10f9a0a634e8 - test: removed file1, changed file2, chan...

Interactive merge with bad input:

  $ hg co -C

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

  updated to "13910f48cf7b: changed file1, removed file2, changed file3"

  1 other heads for branch "default"

  $ hg merge --config ui.interactive=true <<EOF

  > foo

  > bar

  > d

  > baz

  > c

  > EOF

  file 'file1' was deleted in other [merge rev] but was modified in local [working copy].

  You can use (c)hanged version, (d)elete, or leave (u)nresolved.

  What do you want to do? foo

  unrecognized response

  file 'file1' was deleted in other [merge rev] but was modified in local [working copy].

  You can use (c)hanged version, (d)elete, or leave (u)nresolved.

  What do you want to do? bar

  unrecognized response

  file 'file1' was deleted in other [merge rev] but was modified in local [working copy].

  You can use (c)hanged version, (d)elete, or leave (u)nresolved.

  What do you want to do? d

  file 'file2' was deleted in local [working copy] but was modified in other [merge rev].

  You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.

  What do you want to do? baz

  unrecognized response

  file 'file2' was deleted in local [working copy] but was modified in other [merge rev].

  You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.

  What do you want to do? c

  merging file3

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

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

  use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon

  [1]

  $ status

  --- status ---

  M file2

  M file3

  R file1

  --- resolve --list ---

  R file1

  R file2

  U file3

  --- debugmergestate ---

  local (working copy): 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4

  other (merge rev): 10f9a0a634e82080907e62f075ab119cbc565ea6

  file: file1 (state "r")

    local path: file1 (hash 60b27f004e454aca81b0480209cce5081ec52390, flags "")

    ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be)

    other path: file1 (node 0000000000000000000000000000000000000000)

    extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff

  file: file2 (state "r")

    local path: file2 (hash 0000000000000000000000000000000000000000, flags "")

    ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e)

    other path: file2 (node e7c1328648519852e723de86c0c0525acd779257)

    extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff

  file: file3 (state "u")

    local path: file3 (hash d5b0a58bc47161b1b8a831084b366f757c4f0b11, flags "")

    ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4)

    other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb)

    extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff

  *** file1 does not exist

  --- file2 ---

  2

  changed

  --- file3 ---

  3

  <<<<<<< working copy: 13910f48cf7b - test: changed file1, removed file2, chan...

  changed2

  =======

  changed1

  >>>>>>> merge rev:    10f9a0a634e8 - test: removed file1, changed file2, chan...

Interactive merge with not enough input:

  $ hg co -C

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

  updated to "13910f48cf7b: changed file1, removed file2, changed file3"

  1 other heads for branch "default"

  $ hg merge --config ui.interactive=true <<EOF

  > d

  > EOF

  file 'file1' was deleted in other [merge rev] but was modified in local [working copy].

  You can use (c)hanged version, (d)elete, or leave (u)nresolved.

  What do you want to do? d

  file 'file2' was deleted in local [working copy] but was modified in other [merge rev].

  You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.

  What do you want to do? 

  merging file3

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

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

  use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon

  [1]

  $ status

  --- status ---

  M file2

  M file3

  R file1

  --- resolve --list ---

  R file1

  U file2

  U file3

  --- debugmergestate ---

  local (working copy): 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4

  other (merge rev): 10f9a0a634e82080907e62f075ab119cbc565ea6

  file: file1 (state "r")

    local path: file1 (hash 60b27f004e454aca81b0480209cce5081ec52390, flags "")

    ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be)

    other path: file1 (node 0000000000000000000000000000000000000000)

    extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff

  file: file2 (state "u")

    local path: file2 (hash 0000000000000000000000000000000000000000, flags "")

    ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e)

    other path: file2 (node e7c1328648519852e723de86c0c0525acd779257)

    extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff

  file: file3 (state "u")

    local path: file3 (hash d5b0a58bc47161b1b8a831084b366f757c4f0b11, flags "")

    ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4)

    other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb)

    extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff

  *** file1 does not exist

  --- file2 ---

  2

  changed

  --- file3 ---

  3

  <<<<<<< working copy: 13910f48cf7b - test: changed file1, removed file2, chan...

  changed2

  =======

  changed1

  >>>>>>> merge rev:    10f9a0a634e8 - test: removed file1, changed file2, chan...

Choose local versions of files

  $ hg co -C

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

  updated to "13910f48cf7b: changed file1, removed file2, changed file3"

  1 other heads for branch "default"

  $ hg merge --tool :local

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

  (branch merge, don't forget to commit)

  $ status 2>&1 | tee $TESTTMP/local.status

  --- status ---

  file2: * (glob)

  M file3

  C file1

  --- resolve --list ---

  R file1

  R file2

  R file3

  --- debugmergestate ---

  local (working copy): 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4

  other (merge rev): 10f9a0a634e82080907e62f075ab119cbc565ea6

  file: file1 (state "r")

    local path: file1 (hash 60b27f004e454aca81b0480209cce5081ec52390, flags "")

    ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be)

    other path: file1 (node 0000000000000000000000000000000000000000)

    extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff

  file: file2 (state "r")

    local path: file2 (hash 0000000000000000000000000000000000000000, flags "")

    ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e)

    other path: file2 (node e7c1328648519852e723de86c0c0525acd779257)

    extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff

  file: file3 (state "r")

    local path: file3 (hash d5b0a58bc47161b1b8a831084b366f757c4f0b11, flags "")

    ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4)

    other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb)

    extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff

  --- file1 ---

  1

  changed

  *** file2 does not exist

  --- file3 ---

  3

  changed2

Choose other versions of files

  $ hg co -C

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

  updated to "13910f48cf7b: changed file1, removed file2, changed file3"

  1 other heads for branch "default"

  $ hg merge --tool :other

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

  (branch merge, don't forget to commit)

  $ status 2>&1 | tee $TESTTMP/other.status

  --- status ---

  M file2

  M file3

  R file1

  --- resolve --list ---

  R file1

  R file2

  R file3

  --- debugmergestate ---

  local (working copy): 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4