equal
deleted
inserted
replaced
24 3 new orphan changesets |
24 3 new orphan changesets |
25 $ hg evolve --config progress.debug=yes --debug |
25 $ hg evolve --config progress.debug=yes --debug |
26 evolve: 1/3 changesets (33.33%) |
26 evolve: 1/3 changesets (33.33%) |
27 move:[1] second |
27 move:[1] second |
28 atop:[4] first v2 |
28 atop:[4] first v2 |
29 evolve: 1/3 changesets (33.33%) |
|
30 hg rebase -r 4f60c78b6d58 -d fd0a2402f834 |
29 hg rebase -r 4f60c78b6d58 -d fd0a2402f834 |
31 evolve: 1/3 changesets (33.33%) |
30 evolve: 1/3 changesets (33.33%) |
32 resolving manifests |
31 resolving manifests |
33 branchmerge: True, force: True, partial: False |
32 branchmerge: True, force: True, partial: False |
34 ancestor: a87874c6ec31, local: fd0a2402f834+, remote: 4f60c78b6d58 |
33 ancestor: a87874c6ec31, local: fd0a2402f834+, remote: 4f60c78b6d58 |
41 committing changelog |
40 committing changelog |
42 updating the branch cache |
41 updating the branch cache |
43 obscache is out of date |
42 obscache is out of date |
44 evolve: 2/3 changesets (66.67%) |
43 evolve: 2/3 changesets (66.67%) |
45 move:[2] third |
44 move:[2] third |
46 evolve: 2/3 changesets (66.67%) |
|
47 hg rebase -r 769574b07a96 -d 5f16d91ecde0 |
45 hg rebase -r 769574b07a96 -d 5f16d91ecde0 |
48 evolve: 2/3 changesets (66.67%) |
46 evolve: 2/3 changesets (66.67%) |
49 unmatched files in other: |
47 unmatched files in other: |
50 b |
48 b |
51 resolving manifests |
49 resolving manifests |
60 committing changelog |
58 committing changelog |
61 updating the branch cache |
59 updating the branch cache |
62 obscache is out of date |
60 obscache is out of date |
63 evolve: 3/3 changesets (100.00%) |
61 evolve: 3/3 changesets (100.00%) |
64 move:[3] fourth |
62 move:[3] fourth |
65 evolve: 3/3 changesets (100.00%) |
|
66 hg rebase -r 22782fddc0ab -d 53c0008d98a0 |
63 hg rebase -r 22782fddc0ab -d 53c0008d98a0 |
67 evolve: 3/3 changesets (100.00%) |
64 evolve: 3/3 changesets (100.00%) |
68 resolving manifests |
65 resolving manifests |
69 branchmerge: True, force: True, partial: False |
66 branchmerge: True, force: True, partial: False |
70 ancestor: 769574b07a96, local: 53c0008d98a0+, remote: 22782fddc0ab |
67 ancestor: 769574b07a96, local: 53c0008d98a0+, remote: 22782fddc0ab |
94 3 new orphan changesets |
91 3 new orphan changesets |
95 $ hg evolve -r 'desc("second")' --config progress.debug=yes --debug |
92 $ hg evolve -r 'desc("second")' --config progress.debug=yes --debug |
96 evolve: 1/1 changesets (100.00%) |
93 evolve: 1/1 changesets (100.00%) |
97 move:[5] second |
94 move:[5] second |
98 atop:[8] first v3 |
95 atop:[8] first v3 |
99 evolve: 1/1 changesets (100.00%) |
|
100 hg rebase -r 5f16d91ecde0 -d 152c368c622b |
96 hg rebase -r 5f16d91ecde0 -d 152c368c622b |
101 evolve: 1/1 changesets (100.00%) |
97 evolve: 1/1 changesets (100.00%) |
102 resolving manifests |
98 resolving manifests |
103 branchmerge: True, force: True, partial: False |
99 branchmerge: True, force: True, partial: False |
104 ancestor: fd0a2402f834, local: 152c368c622b+, remote: 5f16d91ecde0 |
100 ancestor: fd0a2402f834, local: 152c368c622b+, remote: 5f16d91ecde0 |
125 1 new orphan changesets |
121 1 new orphan changesets |
126 $ hg evolve --all --config progress.debug=yes --debug |
122 $ hg evolve --all --config progress.debug=yes --debug |
127 evolve: 1/3 changesets (33.33%) |
123 evolve: 1/3 changesets (33.33%) |
128 move:[9] second |
124 move:[9] second |
129 atop:[10] first v4 |
125 atop:[10] first v4 |
130 evolve: 1/3 changesets (33.33%) |
|
131 hg rebase -r df5d742141b0 -d f8d7d38c0a88 |
126 hg rebase -r df5d742141b0 -d f8d7d38c0a88 |
132 evolve: 1/3 changesets (33.33%) |
127 evolve: 1/3 changesets (33.33%) |
133 resolving manifests |
128 resolving manifests |
134 branchmerge: True, force: True, partial: False |
129 branchmerge: True, force: True, partial: False |
135 ancestor: 152c368c622b, local: f8d7d38c0a88+, remote: df5d742141b0 |
130 ancestor: 152c368c622b, local: f8d7d38c0a88+, remote: df5d742141b0 |