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

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

Make hg update more verbose by default (issue12)...
Make hg update more verbose by default (issue12) (including small changes to revert and backout to not show these stats with the exception of backout --merge) Show update stats (unless -q), e.g.: K files updated, L files merged, M files removed, N files unresolved Inform the user what to do after a merge: (branch merge, don't forget to commit) Inform the user what to do if a branch merge failed: There are unresolved merges, you can redo the full merge using: hg update -C X hg merge Y Inform the user what to do if a working directory merge failed: There are unresolved merges with locally modified files.
Thomas Arendsen Hein - - Load All Authors

File last commit:

r2175:b2ae81a7 default
r2175:b2ae81a7 default
Show More
test-excessive-merge.out
65 lines | 2.3 KiB | text/plain | TextLexer
/ tests / test-excessive-merge.out
History | Source | Raw |Copy content |Copy permalink
Thomas Arendsen Hein
Make hg update more verbose by default (issue12)...
 r2175 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
1 files updated, 0 files merged, 0 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
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....
 r1933 changeset: 4:f6c172c6198c
Matt Mackall
Refactor excessive merge detection, add test
 r1716 tag: tip
Thomas Arendsen Hein
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....
 r1933 parent: 1:448a8c5e42f1
parent: 2:7c5dc2e857f2
Matt Mackall
Refactor excessive merge detection, add test
 r1716 user: test
Thomas Arendsen Hein
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....
 r1933 date: Mon Jan 12 13:46:40 1970 +0000
Matt Mackall
Refactor excessive merge detection, add test
 r1716 summary: merge a/b -> blah
Thomas Arendsen Hein
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....
 r1933 changeset: 3:13d875a22764
parent: 2:7c5dc2e857f2
parent: 1:448a8c5e42f1
Matt Mackall
Refactor excessive merge detection, add test
 r1716 user: test
Thomas Arendsen Hein
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....
 r1933 date: Mon Jan 12 13:46:40 1970 +0000
Matt Mackall
Refactor excessive merge detection, add test
 r1716 summary: merge b/a -> blah
Thomas Arendsen Hein
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....
 r1933 changeset: 2:7c5dc2e857f2
parent: 0:dc1751ec2e9d
Matt Mackall
Refactor excessive merge detection, add test
 r1716 user: test
Thomas Arendsen Hein
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....
 r1933 date: Mon Jan 12 13:46:40 1970 +0000
Matt Mackall
Refactor excessive merge detection, add test
 r1716 summary: branch b
Thomas Arendsen Hein
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....
 r1933 changeset: 1:448a8c5e42f1
Matt Mackall
Refactor excessive merge detection, add test
 r1716 user: test
Thomas Arendsen Hein
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....
 r1933 date: Mon Jan 12 13:46:40 1970 +0000
Matt Mackall
Refactor excessive merge detection, add test
 r1716 summary: branch a
Thomas Arendsen Hein
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....
 r1933 changeset: 0:dc1751ec2e9d
Matt Mackall
Refactor excessive merge detection, add test
 r1716 user: test
Thomas Arendsen Hein
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....
 r1933 date: Mon Jan 12 13:46:40 1970 +0000
Matt Mackall
Refactor excessive merge detection, add test
 r1716 summary: test
rev offset length base linkrev nodeid p1 p2
Thomas Arendsen Hein
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....
 r1933 0 0 64 0 0 dc1751ec2e9d 000000000000 000000000000
1 64 68 1 1 448a8c5e42f1 dc1751ec2e9d 000000000000
2 132 68 2 2 7c5dc2e857f2 dc1751ec2e9d 000000000000
3 200 75 3 3 13d875a22764 7c5dc2e857f2 448a8c5e42f1
4 275 29 3 4 f6c172c6198c 448a8c5e42f1 7c5dc2e857f2
Matt Mackall
Refactor excessive merge detection, add test
 r1716
1
79d7492df40aa0fa093ec4209be78043c181f094 644 a
2ed2a3912a0b24502043eae84ee4b279c18b90dd 644 b
2
2ed2a3912a0b24502043eae84ee4b279c18b90dd 644 a
79d7492df40aa0fa093ec4209be78043c181f094 644 b
3
79d7492df40aa0fa093ec4209be78043c181f094 644 a
79d7492df40aa0fa093ec4209be78043c181f094 644 b
4
79d7492df40aa0fa093ec4209be78043c181f094 644 a
79d7492df40aa0fa093ec4209be78043c181f094 644 b
rev offset length base linkrev nodeid p1 p2
0 0 5 0 0 2ed2a3912a0b 000000000000 000000000000
1 5 6 1 1 79d7492df40a 2ed2a3912a0b 000000000000
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
2 files, 5 changesets, 4 total revisions