##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

run-tests: give each child its own tmp dir (issue1911)...
run-tests: give each child its own tmp dir (issue1911) Fixes bug introduced by f8b4df4b033d (issue1911: --tmpdir plus parallel mode = fail), and also fixes the long-standing quirk that parallel mode created multiple /tmp/hgtests.XXXXXX directories. Now there is only one /tmp/hgtests.XXXXXX, with child0, child1, etc. under it.
Mads Kiilerich - - Load All Authors

File last commit:

r8940:01ada7b1 default
r9899:be574a37 stable
Show More
test-merge-prompt.out
69 lines | 2.0 KiB | text/plain | TextLexer
/ tests / test-merge-prompt.out
History | Source | Raw |Copy content |Copy permalink
Thomas Arendsen Hein
Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge)
 r5672 adding file1
adding file2
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
Dirkjan Ochtman
warn about new heads on commit (issue842)
 r6336 created new head
Thomas Arendsen Hein
Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge)
 r5672
# non-interactive merge
Mads Kiilerich
ui.prompt: Show prompt and selection in non-interactive mode...
 r8940 local changed file1 which remote deleted
use (c)hanged version or (d)elete? c
remote changed file2 which local deleted
use (c)hanged version or leave (d)eleted? c
Thomas Arendsen Hein
Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge)
 r5672 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
status:
M file2
Matt Mackall
Backed out changeset c2a21fe60994...
 r5764 C file1
Thomas Arendsen Hein
Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge)
 r5672 file1:
1
changed
file2:
2
changed
# interactive merge
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
local changed file1 which remote deleted
use (c)hanged version or (d)elete? remote changed file2 which local deleted
use (c)hanged version or leave (d)eleted? 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
status:
file2: No such file or directory
Matt Mackall
Backed out changeset c2a21fe60994...
 r5764 C file1
Thomas Arendsen Hein
Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge)
 r5672 file1:
1
changed
file2 does not exist
# interactive merge with bad input
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
local changed file1 which remote deleted
use (c)hanged version or (d)elete? unrecognized response
local changed file1 which remote deleted
use (c)hanged version or (d)elete? unrecognized response
local changed file1 which remote deleted
use (c)hanged version or (d)elete? remote changed file2 which local deleted
use (c)hanged version or leave (d)eleted? unrecognized response
remote changed file2 which local deleted
use (c)hanged version or leave (d)eleted? 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
(branch merge, don't forget to commit)
status:
M file2
R file1
file1 does not exist
file2:
2
changed
# interactive merge with not enough input
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
local changed file1 which remote deleted
use (c)hanged version or (d)elete? remote changed file2 which local deleted
use (c)hanged version or leave (d)eleted? abort: response expected
failed
status:
file2: No such file or directory
Matt Mackall
Backed out changeset c2a21fe60994...
 r5764 C file1
Thomas Arendsen Hein
Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge)
 r5672 file1:
1
changed
file2 does not exist