test-merge1.out
64 lines
| 1.7 KiB
| text/plain
|
TextLexer
/ tests / test-merge1.out
|
r2175 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||
|
r6336 | created new head | ||
|
r1236 | %% no merges expected | ||
|
r8387 | changeset: 1:4ee19afe4659 | ||
user: test | ||||
date: Mon Jan 12 13:46:40 1970 +0000 | ||||
summary: commit #1 | ||||
|
r3400 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
|
r2175 | (branch merge, don't forget to commit) | ||
|
r3330 | diff -r d9e5953b9dec b | ||
--- /dev/null | ||||
+++ b/b | ||||
@@ -0,0 +1,1 @@ | ||||
+This is file b1 | ||||
M b | ||||
|
r2175 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||
|
r6336 | created new head | ||
|
r1581 | %% merge should fail | ||
|
r5670 | abort: untracked file in working directory differs from file in requested revision: 'b' | ||
|
r1236 | %% merge of b expected | ||
|
r407 | merging for b | ||
merging b | ||||
|
r2175 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | ||
(branch merge, don't forget to commit) | ||||
|
r3330 | diff -r d9e5953b9dec b | ||
--- /dev/null | ||||
+++ b/b | ||||
@@ -0,0 +1,1 @@ | ||||
+This is file b2 | ||||
M b | ||||
|
r1236 | %% | ||
|
r2175 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
|
r6336 | created new head | ||
|
r1236 | Contents of b should be "this is file b1" | ||
|
r430 | This is file b1 | ||
|
r1581 | %% merge fails | ||
|
r8545 | abort: outstanding uncommitted changes (use 'hg status' to list changes) | ||
|
r1236 | %% merge expected! | ||
|
r3400 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
|
r2175 | (branch merge, don't forget to commit) | ||
|
r3330 | diff -r c1dd73cbf59f b | ||
--- a/b | ||||
+++ b/b | ||||
|
r5863 | @@ -1,1 +1,1 @@ | ||
|
r3330 | -This is file b1 | ||
+This is file b22 | ||||
M b | ||||
|
r2175 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
|
r6336 | created new head | ||
|
r1581 | %% merge of b should fail | ||
|
r8545 | abort: outstanding uncommitted changes (use 'hg status' to list changes) | ||
|
r1236 | %% merge of b expected | ||
|
r407 | merging for b | ||
merging b | ||||
|
r2175 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | ||
(branch merge, don't forget to commit) | ||||
|
r3330 | diff -r c1dd73cbf59f b | ||
--- a/b | ||||
+++ b/b | ||||
|
r5863 | @@ -1,1 +1,1 @@ | ||
|
r3330 | -This is file b1 | ||
+This is file b33 | ||||
M b | ||||