Mercurial > evolve
annotate tests/test-evolve-progress.t @ 5277:304de9a04172
tests: avoid referring to commits by hash in a few places
This patch means that the next patch can be written without manual
editing of the test cases.
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Fri, 01 May 2020 07:44:01 -0700 |
parents | 4da1d21231ae |
children | 30a924abda75 fd2d61769bd0 |
rev | line source |
---|---|
4596
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
1 Test Evolve progress output |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
2 =========================== |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
3 |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
4 $ . "$TESTDIR/testlib/common.sh" |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
5 $ cat >> $HGRCPATH <<EOF |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
6 > [extensions] |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
7 > evolve= |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
8 > EOF |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
9 |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
10 $ hg init progress |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
11 $ cd progress |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
12 $ echo a > a |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
13 $ hg ci -Aqm first |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
14 $ echo a2 > a |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
15 $ hg ci -m second |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
16 $ echo b > b |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
17 $ hg ci -Aqm third |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
18 $ echo b2 > b |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
19 $ hg ci -m fourth |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
20 |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
21 Test progress with --all |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
22 $ hg co -q 'desc("first")' |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
23 $ hg amend -m 'first v2' |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
24 3 new orphan changesets |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
25 $ hg evolve --config progress.debug=yes --debug |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
26 evolve: 1/3 changesets (33.33%) |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
27 move:[1] second |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
28 atop:[4] first v2 |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
29 hg rebase -r 4f60c78b6d58 -d fd0a2402f834 |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
30 evolve: 1/3 changesets (33.33%) |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
31 resolving manifests |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
32 branchmerge: True, force: True, partial: False |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
33 ancestor: a87874c6ec31, local: fd0a2402f834+, remote: 4f60c78b6d58 |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
34 a: remote is newer -> g |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
35 getting a |
5244
4da1d21231ae
tests: update output to match 1b8fd4af3318 in core
Anton Shestakov <av6@dwimlabs.net>
parents:
5151
diff
changeset
|
36 updating: a 1/2 files (50.00%) |
4596
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
37 committing files: |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
38 a |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
39 committing manifest |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
40 committing changelog |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
41 evolve: 2/3 changesets (66.67%) |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
42 move:[2] third |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
43 hg rebase -r 769574b07a96 -d 5f16d91ecde0 |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
44 evolve: 2/3 changesets (66.67%) |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
45 resolving manifests |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
46 branchmerge: True, force: True, partial: False |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
47 ancestor: 4f60c78b6d58, local: 5f16d91ecde0+, remote: 769574b07a96 |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
48 b: remote created -> g |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
49 getting b |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
50 updating: b 1/1 files (100.00%) |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
51 committing files: |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
52 b |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
53 committing manifest |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
54 committing changelog |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
55 evolve: 3/3 changesets (100.00%) |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
56 move:[3] fourth |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
57 hg rebase -r 22782fddc0ab -d 53c0008d98a0 |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
58 evolve: 3/3 changesets (100.00%) |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
59 resolving manifests |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
60 branchmerge: True, force: True, partial: False |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
61 ancestor: 769574b07a96, local: 53c0008d98a0+, remote: 22782fddc0ab |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
62 b: remote is newer -> g |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
63 getting b |
5244
4da1d21231ae
tests: update output to match 1b8fd4af3318 in core
Anton Shestakov <av6@dwimlabs.net>
parents:
5151
diff
changeset
|
64 updating: b 1/2 files (50.00%) |
4596
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
65 committing files: |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
66 b |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
67 committing manifest |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
68 committing changelog |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
69 updating the branch cache |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
70 obscache is out of date |
4725
f162cafc5000
tests: update output for new branch cache messsages from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents:
4676
diff
changeset
|
71 invalid branch cache (served): tip differs |
4596
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
72 resolving manifests |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
73 branchmerge: False, force: False, partial: False |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
74 ancestor: 385376d04062, local: 385376d04062+, remote: fd0a2402f834 |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
75 b: other deleted -> r |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
76 removing b |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
77 updating: b 1/2 files (50.00%) |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
78 a: remote is newer -> g |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
79 getting a |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
80 updating: a 2/2 files (100.00%) |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
81 |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
82 Test progress with -r |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
83 $ hg co -q 'desc("first")' |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
84 $ hg amend -m 'first v3' |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
85 3 new orphan changesets |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
86 $ hg evolve -r 'desc("second")' --config progress.debug=yes --debug |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
87 evolve: 1/1 changesets (100.00%) |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
88 move:[5] second |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
89 atop:[8] first v3 |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
90 hg rebase -r 5f16d91ecde0 -d 152c368c622b |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
91 evolve: 1/1 changesets (100.00%) |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
92 resolving manifests |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
93 branchmerge: True, force: True, partial: False |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
94 ancestor: fd0a2402f834, local: 152c368c622b+, remote: 5f16d91ecde0 |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
95 a: remote is newer -> g |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
96 getting a |
5244
4da1d21231ae
tests: update output to match 1b8fd4af3318 in core
Anton Shestakov <av6@dwimlabs.net>
parents:
5151
diff
changeset
|
97 updating: a 1/2 files (50.00%) |
4596
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
98 committing files: |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
99 a |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
100 committing manifest |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
101 committing changelog |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
102 updating the branch cache |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
103 obscache is out of date |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
104 resolving manifests |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
105 branchmerge: False, force: False, partial: False |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
106 ancestor: df5d742141b0, local: df5d742141b0+, remote: 152c368c622b |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
107 a: remote is newer -> g |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
108 getting a |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
109 updating: a 1/1 files (100.00%) |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
110 |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
111 Test progress with --continue |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
112 $ hg co -q 'desc("first")' |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
113 $ echo conflict > a |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
114 $ hg amend -m 'first v4' |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
115 1 new orphan changesets |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
116 $ hg evolve --all --config progress.debug=yes --debug |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
117 evolve: 1/3 changesets (33.33%) |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
118 move:[9] second |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
119 atop:[10] first v4 |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
120 hg rebase -r df5d742141b0 -d f8d7d38c0a88 |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
121 evolve: 1/3 changesets (33.33%) |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
122 resolving manifests |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
123 branchmerge: True, force: True, partial: False |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
124 ancestor: 152c368c622b, local: f8d7d38c0a88+, remote: df5d742141b0 |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
125 preserving a for resolve of a |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
126 a: versions differ -> m (premerge) |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
127 updating: a 1/1 files (100.00%) |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
128 picked tool ':merge' for a (binary False symlink False changedelete False) |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
129 merging a |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
130 my a@f8d7d38c0a88+ other a@df5d742141b0 ancestor a@152c368c622b |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
131 a: versions differ -> m (merge) |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
132 updating: a 2/2 files (100.00%) |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
133 picked tool ':merge' for a (binary False symlink False changedelete False) |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
134 my a@f8d7d38c0a88+ other a@df5d742141b0 ancestor a@152c368c622b |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
135 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
4676
b6c819facbe8
evolvecmd: the proper way to deal with conflicts is to resolve them
Anton Shestakov <av6@dwimlabs.net>
parents:
4668
diff
changeset
|
136 unresolved merge conflicts |
b6c819facbe8
evolvecmd: the proper way to deal with conflicts is to resolve them
Anton Shestakov <av6@dwimlabs.net>
parents:
4668
diff
changeset
|
137 (see 'hg help evolve.interrupted') |
4596
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
138 [1] |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
139 $ echo resolved > a |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
140 $ hg resolve -m a |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
141 (no more unresolved files) |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
142 continue: hg evolve --continue |
4600
ef899ea7456d
evolve: stop passing no-op "progresscb" into continueevolve()
Martin von Zweigbergk <martinvonz@google.com>
parents:
4599
diff
changeset
|
143 $ hg evolve --continue --config progress.debug=yes --debug |
4596
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
144 evolving 9:df5d742141b0 "second" |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
145 committing files: |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
146 a |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
147 committing manifest |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
148 committing changelog |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
149 updating the branch cache |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
150 obscache is out of date |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
151 move:[6] third |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
152 atop:[11] second |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
153 hg rebase -r 53c0008d98a0 -d 60a86497fbfe |
4603
8cc329d705f9
evolve: add progress support for --continue
Martin von Zweigbergk <martinvonz@google.com>
parents:
4600
diff
changeset
|
154 evolve: 2/3 changesets (66.67%) |
4596
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
155 resolving manifests |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
156 branchmerge: True, force: True, partial: False |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
157 ancestor: 5f16d91ecde0, local: 60a86497fbfe+, remote: 53c0008d98a0 |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
158 b: remote created -> g |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
159 getting b |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
160 updating: b 1/1 files (100.00%) |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
161 committing files: |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
162 b |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
163 committing manifest |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
164 committing changelog |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
165 move:[7] fourth |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
166 hg rebase -r 385376d04062 -d b2de95304e32 |
4603
8cc329d705f9
evolve: add progress support for --continue
Martin von Zweigbergk <martinvonz@google.com>
parents:
4600
diff
changeset
|
167 evolve: 3/3 changesets (100.00%) |
4596
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
168 resolving manifests |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
169 branchmerge: True, force: True, partial: False |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
170 ancestor: 53c0008d98a0, local: b2de95304e32+, remote: 385376d04062 |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
171 b: remote is newer -> g |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
172 getting b |
5244
4da1d21231ae
tests: update output to match 1b8fd4af3318 in core
Anton Shestakov <av6@dwimlabs.net>
parents:
5151
diff
changeset
|
173 updating: b 1/2 files (50.00%) |
4596
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
174 committing files: |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
175 b |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
176 committing manifest |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
177 committing changelog |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
178 updating the branch cache |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
179 obscache is out of date |
4725
f162cafc5000
tests: update output for new branch cache messsages from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents:
4676
diff
changeset
|
180 invalid branch cache (served): tip differs |
4596
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
181 resolving manifests |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
182 branchmerge: False, force: False, partial: False |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
183 ancestor: c6e6fdb1d046, local: c6e6fdb1d046+, remote: f8d7d38c0a88 |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
184 b: other deleted -> r |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
185 removing b |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
186 updating: b 1/2 files (50.00%) |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
187 a: remote is newer -> g |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
188 getting a |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
189 updating: a 2/2 files (100.00%) |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
190 working directory is now at f8d7d38c0a88 |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
191 |
78d60913ea9f
tests: add some basic testing of progress
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
192 $ cd .. |