test-log.out
730 lines
| 16.2 KiB
| text/plain
|
TextLexer
/ tests / test-log.out
Vadim Gelfer
|
r2741 | adding a | ||
changeset: 0:8580ff50825a | ||||
user: test | ||||
date: Thu Jan 01 00:00:01 1970 +0000 | ||||
summary: a | ||||
% -f, directory | ||||
Brendan Cully
|
r7404 | abort: cannot follow nonexistent file: "dir" | ||
Vadim Gelfer
|
r2741 | % -f, but no args | ||
Ronny Pfannschmidt
|
r10490 | changeset: 4:66c1345dc4f9 | ||
Vadim Gelfer
|
r2741 | tag: tip | ||
user: test | ||||
date: Thu Jan 01 00:00:05 1970 +0000 | ||||
summary: e | ||||
Ronny Pfannschmidt
|
r10490 | changeset: 3:7c6c671bb7cc | ||
Vadim Gelfer
|
r2741 | user: test | ||
date: Thu Jan 01 00:00:04 1970 +0000 | ||||
summary: d | ||||
Ronny Pfannschmidt
|
r10490 | changeset: 2:41dd4284081e | ||
Vadim Gelfer
|
r2741 | user: test | ||
date: Thu Jan 01 00:00:03 1970 +0000 | ||||
summary: c | ||||
Ronny Pfannschmidt
|
r10490 | changeset: 1:784de7cef101 | ||
Vadim Gelfer
|
r2741 | user: test | ||
date: Thu Jan 01 00:00:02 1970 +0000 | ||||
summary: b | ||||
changeset: 0:8580ff50825a | ||||
user: test | ||||
date: Thu Jan 01 00:00:01 1970 +0000 | ||||
summary: a | ||||
% one rename | ||||
Matt Mackall
|
r2966 | changeset: 0:8580ff50825a | ||
Vadim Gelfer
|
r2741 | user: test | ||
date: Thu Jan 01 00:00:01 1970 +0000 | ||||
files: a | ||||
description: | ||||
a | ||||
% many renames | ||||
Ronny Pfannschmidt
|
r10490 | changeset: 4:66c1345dc4f9 | ||
Vadim Gelfer
|
r2741 | tag: tip | ||
user: test | ||||
date: Thu Jan 01 00:00:05 1970 +0000 | ||||
files: dir/b e | ||||
description: | ||||
e | ||||
Ronny Pfannschmidt
|
r10490 | changeset: 2:41dd4284081e | ||
Vadim Gelfer
|
r2741 | user: test | ||
date: Thu Jan 01 00:00:03 1970 +0000 | ||||
files: b dir/b | ||||
description: | ||||
c | ||||
Ronny Pfannschmidt
|
r10490 | changeset: 1:784de7cef101 | ||
Vadim Gelfer
|
r2741 | user: test | ||
date: Thu Jan 01 00:00:02 1970 +0000 | ||||
files: b | ||||
description: | ||||
b | ||||
Matt Mackall
|
r2966 | changeset: 0:8580ff50825a | ||
Vadim Gelfer
|
r2741 | user: test | ||
date: Thu Jan 01 00:00:01 1970 +0000 | ||||
files: a | ||||
description: | ||||
a | ||||
Joel Rosdahl
|
r11562 | % log -pf dir/b | ||
changeset: 2:41dd4284081e | ||||
user: test | ||||
date: Thu Jan 01 00:00:03 1970 +0000 | ||||
summary: c | ||||
diff -r 784de7cef101 -r 41dd4284081e dir/b | ||||
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 | ||||
+++ b/dir/b Thu Jan 01 00:00:03 1970 +0000 | ||||
@@ -0,0 +1,1 @@ | ||||
+a | ||||
changeset: 1:784de7cef101 | ||||
user: test | ||||
date: Thu Jan 01 00:00:02 1970 +0000 | ||||
summary: b | ||||
diff -r 8580ff50825a -r 784de7cef101 b | ||||
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 | ||||
+++ b/b Thu Jan 01 00:00:02 1970 +0000 | ||||
@@ -0,0 +1,1 @@ | ||||
+a | ||||
changeset: 0:8580ff50825a | ||||
user: test | ||||
date: Thu Jan 01 00:00:01 1970 +0000 | ||||
summary: a | ||||
diff -r 000000000000 -r 8580ff50825a a | ||||
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 | ||||
+++ b/a Thu Jan 01 00:00:01 1970 +0000 | ||||
@@ -0,0 +1,1 @@ | ||||
+a | ||||
% log -vf dir/b | ||||
changeset: 2:41dd4284081e | ||||
user: test | ||||
date: Thu Jan 01 00:00:03 1970 +0000 | ||||
files: b dir/b | ||||
description: | ||||
c | ||||
changeset: 1:784de7cef101 | ||||
user: test | ||||
date: Thu Jan 01 00:00:02 1970 +0000 | ||||
files: b | ||||
description: | ||||
b | ||||
changeset: 0:8580ff50825a | ||||
user: test | ||||
date: Thu Jan 01 00:00:01 1970 +0000 | ||||
files: a | ||||
description: | ||||
a | ||||
Patrick Mezard
|
r10060 | % log copies with --copies | ||
4 e (dir/b) | ||||
3 b (a) | ||||
2 dir/b (b) | ||||
1 b (a) | ||||
0 | ||||
Patrick Mezard
|
r10061 | % log copies switch without --copies, with old filecopy template | ||
Patrick Mezard
|
r10060 | 4 | ||
3 | ||||
2 | ||||
1 | ||||
0 | ||||
% log copies switch with --copies | ||||
Brendan Cully
|
r3197 | 4 e (dir/b) | ||
3 b (a) | ||||
2 dir/b (b) | ||||
1 b (a) | ||||
0 | ||||
Greg Ward
|
r10776 | % log copies with hardcoded style and with --style=default | ||
changeset: 4:66c1345dc4f9 | ||||
tag: tip | ||||
user: test | ||||
date: Thu Jan 01 00:00:05 1970 +0000 | ||||
files: dir/b e | ||||
copies: e (dir/b) | ||||
description: | ||||
e | ||||
changeset: 4:66c1345dc4f9 | ||||
tag: tip | ||||
user: test | ||||
date: Thu Jan 01 00:00:05 1970 +0000 | ||||
files: dir/b e | ||||
copies: e (dir/b) | ||||
description: | ||||
e | ||||
Brendan Cully
|
r3383 | % log copies, non-linear manifest | ||
1 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
adding foo | ||||
Dirkjan Ochtman
|
r6336 | created new head | ||
Brendan Cully
|
r3383 | 5 e (dir/b) | ||
Maxim Dounin
|
r5811 | % log copies, execute bit set | ||
6 | ||||
Matt Mackall
|
r3837 | % log -p d | ||
Ronny Pfannschmidt
|
r10490 | changeset: 3:7c6c671bb7cc | ||
Matt Mackall
|
r3837 | user: test | ||
date: Thu Jan 01 00:00:04 1970 +0000 | ||||
files: a b d | ||||
description: | ||||
d | ||||
Ronny Pfannschmidt
|
r10490 | diff -r 41dd4284081e -r 7c6c671bb7cc d | ||
Matt Mackall
|
r3837 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | ||
+++ b/d Thu Jan 01 00:00:04 1970 +0000 | ||||
@@ -0,0 +1,1 @@ | ||||
+a | ||||
Nicolas Dumazet
|
r11631 | % log --removed file | ||
changeset: 3:7c6c671bb7cc | ||||
user: test | ||||
date: Thu Jan 01 00:00:04 1970 +0000 | ||||
files: a b d | ||||
description: | ||||
d | ||||
changeset: 0:8580ff50825a | ||||
user: test | ||||
date: Thu Jan 01 00:00:01 1970 +0000 | ||||
files: a | ||||
description: | ||||
a | ||||
% log --removed revrange file | ||||
changeset: 0:8580ff50825a | ||||
user: test | ||||
date: Thu Jan 01 00:00:01 1970 +0000 | ||||
files: a | ||||
description: | ||||
a | ||||
Brendan Cully
|
r2785 | adding base | ||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
adding b1 | ||||
Dirkjan Ochtman
|
r6336 | created new head | ||
Brendan Cully
|
r2785 | % log -f | ||
Matt Mackall
|
r4180 | changeset: 3:e62f78d544b4 | ||
Brendan Cully
|
r2785 | tag: tip | ||
Matt Mackall
|
r4180 | parent: 1:3d5bf5654eda | ||
Brendan Cully
|
r2785 | user: test | ||
date: Thu Jan 01 00:00:01 1970 +0000 | ||||
summary: b1 | ||||
Matt Mackall
|
r4180 | changeset: 1:3d5bf5654eda | ||
Brendan Cully
|
r2785 | user: test | ||
date: Thu Jan 01 00:00:01 1970 +0000 | ||||
summary: r1 | ||||
Matt Mackall
|
r4180 | changeset: 0:67e992f2c4f3 | ||
Brendan Cully
|
r2785 | user: test | ||
date: Thu Jan 01 00:00:01 1970 +0000 | ||||
summary: base | ||||
1 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
adding b2 | ||||
Dirkjan Ochtman
|
r6336 | created new head | ||
Brendan Cully
|
r2785 | % log -f -r 1:tip | ||
Matt Mackall
|
r4180 | changeset: 1:3d5bf5654eda | ||
Brendan Cully
|
r2785 | user: test | ||
date: Thu Jan 01 00:00:01 1970 +0000 | ||||
summary: r1 | ||||
Matt Mackall
|
r4180 | changeset: 2:60c670bf5b30 | ||
Brendan Cully
|
r2785 | user: test | ||
date: Thu Jan 01 00:00:01 1970 +0000 | ||||
summary: r2 | ||||
Matt Mackall
|
r4180 | changeset: 3:e62f78d544b4 | ||
parent: 1:3d5bf5654eda | ||||
Brendan Cully
|
r2785 | user: test | ||
date: Thu Jan 01 00:00:01 1970 +0000 | ||||
summary: b1 | ||||
2 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
(branch merge, don't forget to commit) | ||||
Thomas Arendsen Hein
|
r4510 | % log -r . with two parents | ||
changeset: 3:e62f78d544b4 | ||||
parent: 1:3d5bf5654eda | ||||
user: test | ||||
date: Thu Jan 01 00:00:01 1970 +0000 | ||||
summary: b1 | ||||
% log -r . with one parent | ||||
changeset: 5:302e9dd6890d | ||||
tag: tip | ||||
parent: 3:e62f78d544b4 | ||||
parent: 4:ddb82e70d1a1 | ||||
user: test | ||||
date: Thu Jan 01 00:00:01 1970 +0000 | ||||
summary: m12 | ||||
Brendan Cully
|
r2785 | % log --follow-first | ||
Matt Mackall
|
r4180 | changeset: 6:2404bbcab562 | ||
Brendan Cully
|
r2785 | tag: tip | ||
user: test | ||||
date: Thu Jan 01 00:00:01 1970 +0000 | ||||
summary: b1.1 | ||||
Matt Mackall
|
r4180 | changeset: 5:302e9dd6890d | ||
parent: 3:e62f78d544b4 | ||||
parent: 4:ddb82e70d1a1 | ||||
Brendan Cully
|
r2785 | user: test | ||
date: Thu Jan 01 00:00:01 1970 +0000 | ||||
summary: m12 | ||||
Matt Mackall
|
r4180 | changeset: 3:e62f78d544b4 | ||
parent: 1:3d5bf5654eda | ||||
Brendan Cully
|
r2785 | user: test | ||
date: Thu Jan 01 00:00:01 1970 +0000 | ||||
summary: b1 | ||||
Matt Mackall
|
r4180 | changeset: 1:3d5bf5654eda | ||
Brendan Cully
|
r2785 | user: test | ||
date: Thu Jan 01 00:00:01 1970 +0000 | ||||
summary: r1 | ||||
Matt Mackall
|
r4180 | changeset: 0:67e992f2c4f3 | ||
Brendan Cully
|
r2785 | user: test | ||
date: Thu Jan 01 00:00:01 1970 +0000 | ||||
summary: base | ||||
Brendan Cully
|
r2901 | % log -P 2 | ||
Matt Mackall
|
r4180 | changeset: 6:2404bbcab562 | ||
Brendan Cully
|
r2901 | tag: tip | ||
user: test | ||||
date: Thu Jan 01 00:00:01 1970 +0000 | ||||
summary: b1.1 | ||||
Matt Mackall
|
r4180 | changeset: 5:302e9dd6890d | ||
parent: 3:e62f78d544b4 | ||||
parent: 4:ddb82e70d1a1 | ||||
Brendan Cully
|
r2901 | user: test | ||
date: Thu Jan 01 00:00:01 1970 +0000 | ||||
summary: m12 | ||||
Matt Mackall
|
r4180 | changeset: 4:ddb82e70d1a1 | ||
parent: 0:67e992f2c4f3 | ||||
Brendan Cully
|
r2901 | user: test | ||
date: Thu Jan 01 00:00:01 1970 +0000 | ||||
summary: b2 | ||||
Matt Mackall
|
r4180 | changeset: 3:e62f78d544b4 | ||
parent: 1:3d5bf5654eda | ||||
Brendan Cully
|
r2901 | user: test | ||
date: Thu Jan 01 00:00:01 1970 +0000 | ||||
summary: b1 | ||||
Jim Correia
|
r7762 | % log -r tip -p --git | ||
changeset: 6:2404bbcab562 | ||||
tag: tip | ||||
user: test | ||||
date: Thu Jan 01 00:00:01 1970 +0000 | ||||
summary: b1.1 | ||||
diff --git a/b1 b/b1 | ||||
--- a/b1 | ||||
+++ b/b1 | ||||
@@ -1,1 +1,2 @@ | ||||
b1 | ||||
+postm | ||||
Alexis S. L. Carvalho
|
r3718 | % log -r "" | ||
Matt Mackall
|
r11405 | hg: parse error: empty query | ||
Sune Foldager
|
r7062 | % log -r <some unknown node id> | ||
abort: unknown revision '1000000000000000000000000000000000000000'! | ||||
Dirkjan Ochtman
|
r9373 | % log -k r1 | ||
changeset: 1:3d5bf5654eda | ||||
user: test | ||||
date: Thu Jan 01 00:00:01 1970 +0000 | ||||
summary: r1 | ||||
Christian Ebert
|
r9421 | % log -d -1 | ||
Brodie Rao
|
r10826 | % log -p -l2 --color=always | ||
[0;33mchangeset: 6:2404bbcab562[0m | ||||
tag: tip | ||||
user: test | ||||
date: Thu Jan 01 00:00:01 1970 +0000 | ||||
summary: b1.1 | ||||
[0;1mdiff -r 302e9dd6890d -r 2404bbcab562 b1[0m | ||||
[0;31;1m--- a/b1 Thu Jan 01 00:00:01 1970 +0000[0m | ||||
[0;32;1m+++ b/b1 Thu Jan 01 00:00:01 1970 +0000[0m | ||||
[0;35m@@ -1,1 +1,2 @@[0m | ||||
b1 | ||||
[0;32m+postm[0m | ||||
[0;33mchangeset: 5:302e9dd6890d[0m | ||||
parent: 3:e62f78d544b4 | ||||
parent: 4:ddb82e70d1a1 | ||||
user: test | ||||
date: Thu Jan 01 00:00:01 1970 +0000 | ||||
summary: m12 | ||||
[0;1mdiff -r e62f78d544b4 -r 302e9dd6890d b2[0m | ||||
[0;31;1m--- /dev/null Thu Jan 01 00:00:00 1970 +0000[0m | ||||
[0;32;1m+++ b/b2 Thu Jan 01 00:00:01 1970 +0000[0m | ||||
[0;35m@@ -0,0 +1,1 @@[0m | ||||
[0;32m+b2[0m | ||||
Yuya Nishihara
|
r11061 | % log -r tip --stat | ||
changeset: 6:2404bbcab562 | ||||
tag: tip | ||||
user: test | ||||
date: Thu Jan 01 00:00:01 1970 +0000 | ||||
summary: b1.1 | ||||
b1 | 1 + | ||||
1 files changed, 1 insertions(+), 0 deletions(-) | ||||
Henrik Stuart
|
r8020 | adding a | ||
adding b | ||||
changeset: 0:29a4c94f1924 | ||||
user: User One <user1@example.org> | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: a | ||||
changeset: 1:e834b5e69c0e | ||||
tag: tip | ||||
user: User Two <user2@example.org> | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: b | ||||
changeset: 0:29a4c94f1924 | ||||
user: User One <user1@example.org> | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: a | ||||
Steve Losh
|
r10957 | adding a | ||
marked working directory as branch test | ||||
adding b | ||||
0 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
adding c | ||||
1 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
adding c | ||||
% log -b default | ||||
changeset: 2:c3a4f03cc9a7 | ||||
parent: 0:24427303d56f | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: commit on default | ||||
changeset: 0:24427303d56f | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: commit on default | ||||
% log -b test | ||||
changeset: 3:f5d8de11c2e2 | ||||
branch: test | ||||
tag: tip | ||||
parent: 1:d32277701ccb | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: commit on test | ||||
changeset: 1:d32277701ccb | ||||
branch: test | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: commit on test | ||||
% log -b dummy | ||||
Steve Losh
|
r10960 | abort: unknown revision 'dummy'! | ||
% log -b . | ||||
changeset: 3:f5d8de11c2e2 | ||||
branch: test | ||||
tag: tip | ||||
parent: 1:d32277701ccb | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: commit on test | ||||
changeset: 1:d32277701ccb | ||||
branch: test | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: commit on test | ||||
Steve Losh
|
r10957 | % log -b default -b test | ||
changeset: 3:f5d8de11c2e2 | ||||
branch: test | ||||
tag: tip | ||||
parent: 1:d32277701ccb | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: commit on test | ||||
changeset: 2:c3a4f03cc9a7 | ||||
parent: 0:24427303d56f | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: commit on default | ||||
changeset: 1:d32277701ccb | ||||
branch: test | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: commit on test | ||||
changeset: 0:24427303d56f | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: commit on default | ||||
Steve Losh
|
r10960 | % log -b default -b . | ||
changeset: 3:f5d8de11c2e2 | ||||
branch: test | ||||
tag: tip | ||||
parent: 1:d32277701ccb | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: commit on test | ||||
changeset: 2:c3a4f03cc9a7 | ||||
parent: 0:24427303d56f | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: commit on default | ||||
changeset: 1:d32277701ccb | ||||
branch: test | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: commit on test | ||||
changeset: 0:24427303d56f | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: commit on default | ||||
% log -b . -b test | ||||
changeset: 3:f5d8de11c2e2 | ||||
branch: test | ||||
tag: tip | ||||
parent: 1:d32277701ccb | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: commit on test | ||||
changeset: 1:d32277701ccb | ||||
branch: test | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: commit on test | ||||
% log -b 2 | ||||
changeset: 2:c3a4f03cc9a7 | ||||
parent: 0:24427303d56f | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: commit on default | ||||
changeset: 0:24427303d56f | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: commit on default | ||||
Yuya Nishihara
|
r11508 | % log -p --cwd dir (in subdir) | ||
changeset: 3:f5d8de11c2e2 | ||||
branch: test | ||||
tag: tip | ||||
parent: 1:d32277701ccb | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: commit on test | ||||
diff -r d32277701ccb -r f5d8de11c2e2 c | ||||
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 | ||||
+++ b/c Thu Jan 01 00:00:00 1970 +0000 | ||||
@@ -0,0 +1,1 @@ | ||||
+c | ||||
changeset: 2:c3a4f03cc9a7 | ||||
parent: 0:24427303d56f | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: commit on default | ||||
diff -r 24427303d56f -r c3a4f03cc9a7 c | ||||
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 | ||||
+++ b/c Thu Jan 01 00:00:00 1970 +0000 | ||||
@@ -0,0 +1,1 @@ | ||||
+c | ||||
changeset: 1:d32277701ccb | ||||
branch: test | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: commit on test | ||||
diff -r 24427303d56f -r d32277701ccb b | ||||
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 | ||||
+++ b/b Thu Jan 01 00:00:00 1970 +0000 | ||||
@@ -0,0 +1,1 @@ | ||||
+b | ||||
changeset: 0:24427303d56f | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: commit on default | ||||
diff -r 000000000000 -r 24427303d56f a | ||||
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 | ||||
+++ b/a Thu Jan 01 00:00:00 1970 +0000 | ||||
@@ -0,0 +1,1 @@ | ||||
+a | ||||
Martin Geisler
|
r11509 | % log -p -R repo | ||
changeset: 0:24427303d56f | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: commit on default | ||||
diff -r 000000000000 -r 24427303d56f a | ||||
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 | ||||
+++ b/a Thu Jan 01 00:00:00 1970 +0000 | ||||
@@ -0,0 +1,1 @@ | ||||
+a | ||||
Nicolas Dumazet
|
r11899 | adding init | ||
adding foo | ||||
adding foo | ||||
1 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
adding branch | ||||
created new head | ||||
adding foo | ||||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
created new head | ||||
merging foo | ||||
warning: conflicts during merge. | ||||
merging foo failed! | ||||
0 files updated, 0 files merged, 0 files removed, 1 files unresolved | ||||
use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon | ||||
merging foo | ||||
warning: conflicts during merge. | ||||
merging foo failed! | ||||
1 files updated, 0 files merged, 0 files removed, 1 files unresolved | ||||
use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon | ||||
@ changeset: 10:4dae8563d2c5 | ||||
|\ tag: tip | ||||
| | parent: 9:7b35701b003e | ||||
| | parent: 4:88176d361b69 | ||||
| | user: test | ||||
| | date: Thu Jan 01 00:00:00 1970 +0000 | ||||
| | summary: Last merge, related | ||||
| | | ||||
| o changeset: 9:7b35701b003e | ||||
| |\ parent: 8:e5416ad8a855 | ||||
| | | parent: 7:87fe3144dcfa | ||||
| | | user: test | ||||
| | | date: Thu Jan 01 00:00:00 1970 +0000 | ||||
| | | summary: First merge, related | ||||
| | | | ||||
| | o changeset: 8:e5416ad8a855 | ||||
| | | parent: 6:dc6c325fe5ee | ||||
| | | user: test | ||||
| | | date: Thu Jan 01 00:00:00 1970 +0000 | ||||
| | | summary: change foo in branch, related | ||||
| | | | ||||
| o | changeset: 7:87fe3144dcfa | ||||
| |/ user: test | ||||
| | date: Thu Jan 01 00:00:00 1970 +0000 | ||||
| | summary: change foo, related | ||||
| | | ||||
| o changeset: 6:dc6c325fe5ee | ||||
| | user: test | ||||
| | date: Thu Jan 01 00:00:00 1970 +0000 | ||||
| | summary: create foo, related | ||||
| | | ||||
| o changeset: 5:73db34516eb9 | ||||
| | parent: 0:e87515fd044a | ||||
| | user: test | ||||
| | date: Thu Jan 01 00:00:00 1970 +0000 | ||||
| | summary: first branch, unrelated | ||||
| | | ||||
o | changeset: 4:88176d361b69 | ||||
| | user: test | ||||
| | date: Thu Jan 01 00:00:00 1970 +0000 | ||||
| | summary: add foo, related | ||||
| | | ||||
o | changeset: 3:dd78ae4afb56 | ||||
| | user: test | ||||
| | date: Thu Jan 01 00:00:00 1970 +0000 | ||||
| | summary: delete foo, unrelated | ||||
| | | ||||
o | changeset: 2:c4c64aedf0f7 | ||||
| | user: test | ||||
| | date: Thu Jan 01 00:00:00 1970 +0000 | ||||
| | summary: add unrelated old foo | ||||
| | | ||||
o | changeset: 1:e5faa7440653 | ||||
|/ user: test | ||||
| date: Thu Jan 01 00:00:00 1970 +0000 | ||||
| summary: change, unrelated | ||||
| | ||||
o changeset: 0:e87515fd044a | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: init, unrelated | ||||
changeset: 10:4dae8563d2c5 | ||||
tag: tip | ||||
parent: 9:7b35701b003e | ||||
parent: 4:88176d361b69 | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: Last merge, related | ||||
changeset: 9:7b35701b003e | ||||
parent: 8:e5416ad8a855 | ||||
parent: 7:87fe3144dcfa | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: First merge, related | ||||
changeset: 8:e5416ad8a855 | ||||
parent: 6:dc6c325fe5ee | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: change foo in branch, related | ||||
changeset: 7:87fe3144dcfa | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: change foo, related | ||||
changeset: 6:dc6c325fe5ee | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: create foo, related | ||||
changeset: 4:88176d361b69 | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: add foo, related | ||||