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

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

add a fix for issue 1175...
add a fix for issue 1175 If we copy a file followed by an update, it's possible for the parent manifest to no longer contain the source file of the copy, which could cause commit to fail. If this happens, we search backwares from the first parent to find the most likely original revision.
Dirkjan Ochtman - - Load All Authors

File last commit:

r6336:4b0c9c67 default
r6875:0d714a48 default
Show More
test-merge-prompt.out
65 lines | 1.8 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
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