| author | Pierre-Yves David <pierre-yves.david@fb.com> |
| Tue, 23 Jun 2015 16:45:55 -0700 | |
| branch | mercurial-2.7 |
| changeset 1431 | 4b156f4c1fbe |
| parent 742 | 760d01a549a6 |
| child 895 | 17ac69db9329 |
| permissions | -rw-r--r-- |
|
269
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
1 |
$ cat >> $HGRCPATH <<EOF |
|
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
2 |
> [defaults] |
|
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
3 |
> amend=-d "0 0" |
|
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
4 |
> [extensions] |
|
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
5 |
> hgext.rebase= |
|
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
6 |
> hgext.graphlog= |
|
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
7 |
> EOF |
|
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
8 |
$ echo "evolve=$(echo $(dirname $TESTDIR))/hgext/evolve.py" >> $HGRCPATH |
|
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
9 |
|
|
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
10 |
$ glog() { |
|
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
11 |
> hg glog --template '{rev}:{node|short}@{branch}({phase}) {desc|firstline}\n' "$@" |
|
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
12 |
> } |
|
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
13 |
|
|
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
14 |
$ hg init repo |
|
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
15 |
$ cd repo |
|
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
16 |
$ echo root > root |
|
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
17 |
$ hg ci -Am addroot |
|
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
18 |
adding root |
|
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
19 |
$ echo a > a |
|
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
20 |
$ hg ci -Am adda |
|
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
21 |
adding a |
|
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
22 |
$ echo b > b |
|
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
23 |
$ hg ci -Am addb |
|
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
24 |
adding b |
|
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
25 |
$ echo c > c |
|
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
26 |
$ hg ci -Am addc |
|
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
27 |
adding c |
|
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
28 |
$ glog |
|
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
29 |
@ 3:7a7552255fb5@default(draft) addc |
|
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
30 |
| |
|
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
31 |
o 2:ef23d6ef94d6@default(draft) addb |
|
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
32 |
| |
|
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
33 |
o 1:93418d2c0979@default(draft) adda |
|
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
34 |
| |
|
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
35 |
o 0:c471ef929e6a@default(draft) addroot |
|
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
36 |
|
|
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
37 |
$ hg gdown |
|
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
38 |
0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
39 |
[2] addb |
|
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
40 |
$ echo b >> b |
|
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
41 |
$ hg amend |
| 486 | 42 |
1 new unstable changesets |
|
269
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
43 |
$ hg gdown |
|
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
44 |
0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
45 |
[1] adda |
|
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
46 |
$ echo a >> a |
|
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
47 |
$ hg amend |
| 486 | 48 |
1 new unstable changesets |
|
269
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
49 |
$ glog |
|
742
760d01a549a6
amend: use core mechanism for amend
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
713
diff
changeset
|
50 |
@ 7:005fe5914f78@default(draft) adda |
|
269
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
51 |
| |
|
742
760d01a549a6
amend: use core mechanism for amend
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
713
diff
changeset
|
52 |
| o 5:22619daeed78@default(draft) addb |
|
269
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
53 |
| | |
|
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
54 |
| | o 3:7a7552255fb5@default(draft) addc |
|
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
55 |
| | | |
|
346
f4302a2079f4
tests: update graphlog output after hg@2e13c1bd34dc
Patrick Mezard <patrick@mezard.eu>
parents:
302
diff
changeset
|
56 |
| | x 2:ef23d6ef94d6@default(draft) addb |
|
269
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
57 |
| |/ |
|
346
f4302a2079f4
tests: update graphlog output after hg@2e13c1bd34dc
Patrick Mezard <patrick@mezard.eu>
parents:
302
diff
changeset
|
58 |
| x 1:93418d2c0979@default(draft) adda |
|
269
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
59 |
|/ |
|
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
60 |
o 0:c471ef929e6a@default(draft) addroot |
|
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
61 |
|
|
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
62 |
|
|
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
63 |
Test stabilizing a predecessor child |
|
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
64 |
|
|
492
7ecd41520dae
rename `stabilize` to `evolve`
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
491
diff
changeset
|
65 |
$ hg evolve -v |
|
269
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
66 |
move:[5] addb |
|
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
67 |
atop:[7] adda |
|
742
760d01a549a6
amend: use core mechanism for amend
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
713
diff
changeset
|
68 |
hg rebase -r 22619daeed78 -d 005fe5914f78 |
|
269
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
69 |
resolving manifests |
|
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
70 |
getting b |
|
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
71 |
b |
|
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
72 |
$ glog |
|
742
760d01a549a6
amend: use core mechanism for amend
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
713
diff
changeset
|
73 |
@ 8:bede829dd2d3@default(draft) addb |
|
269
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
74 |
| |
|
742
760d01a549a6
amend: use core mechanism for amend
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
713
diff
changeset
|
75 |
o 7:005fe5914f78@default(draft) adda |
|
269
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
76 |
| |
|
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
77 |
| o 3:7a7552255fb5@default(draft) addc |
|
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
78 |
| | |
|
346
f4302a2079f4
tests: update graphlog output after hg@2e13c1bd34dc
Patrick Mezard <patrick@mezard.eu>
parents:
302
diff
changeset
|
79 |
| x 2:ef23d6ef94d6@default(draft) addb |
|
269
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
80 |
| | |
|
346
f4302a2079f4
tests: update graphlog output after hg@2e13c1bd34dc
Patrick Mezard <patrick@mezard.eu>
parents:
302
diff
changeset
|
81 |
| x 1:93418d2c0979@default(draft) adda |
|
269
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
82 |
|/ |
|
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
83 |
o 0:c471ef929e6a@default(draft) addroot |
|
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
84 |
|
|
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
85 |
|
|
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
86 |
Test stabilizing a descendant predecessors child |
|
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
87 |
|
|
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
88 |
$ hg up 7 |
|
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
89 |
0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
441
d702f0d26c6a
obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
346
diff
changeset
|
90 |
$ hg debugobsolete > successors.old |
|
492
7ecd41520dae
rename `stabilize` to `evolve`
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
491
diff
changeset
|
91 |
$ hg evolve -v |
|
269
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
92 |
move:[3] addc |
|
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
93 |
atop:[8] addb |
|
742
760d01a549a6
amend: use core mechanism for amend
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
713
diff
changeset
|
94 |
hg rebase -r 7a7552255fb5 -d bede829dd2d3 |
|
269
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
95 |
resolving manifests |
|
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
96 |
getting b |
|
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
97 |
resolving manifests |
|
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
98 |
getting c |
|
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
99 |
c |
|
441
d702f0d26c6a
obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
346
diff
changeset
|
100 |
$ hg debugobsolete > successors.new |
|
281
258169d3428b
test-stabilize-order.t: trace obsolete markers
Patrick Mezard <patrick@mezard.eu>
parents:
269
diff
changeset
|
101 |
$ diff -u successors.old successors.new |
|
258169d3428b
test-stabilize-order.t: trace obsolete markers
Patrick Mezard <patrick@mezard.eu>
parents:
269
diff
changeset
|
102 |
--- successors.old* (glob) |
|
258169d3428b
test-stabilize-order.t: trace obsolete markers
Patrick Mezard <patrick@mezard.eu>
parents:
269
diff
changeset
|
103 |
+++ successors.new* (glob) |
|
441
d702f0d26c6a
obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
346
diff
changeset
|
104 |
@@ -3,3 +3,4 @@ |
|
742
760d01a549a6
amend: use core mechanism for amend
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
713
diff
changeset
|
105 |
93418d2c0979643ad446f621195e78720edb05b4 005fe5914f78e8bc64c7eba28117b0b1fa210d0d 0 {'date': '* *', 'user': 'test'} (glob) |
|
760d01a549a6
amend: use core mechanism for amend
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
713
diff
changeset
|
106 |
7a7d76dc97c57751de9e80f61ed2a639bd03cd24 0 {'date': '* *', 'user': 'test'} (glob) |
|
760d01a549a6
amend: use core mechanism for amend
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
713
diff
changeset
|
107 |
22619daeed78036f80fbd326b6852519c4f0c25e bede829dd2d3b2ae9bf198c23432b250dc964458 0 {'date': '* *', 'user': 'test'} (glob) |
|
760d01a549a6
amend: use core mechanism for amend
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
713
diff
changeset
|
108 |
+7a7552255fb5f8bd745e46fba6f0ca633a4dd716 65095d7d0dd5e4f15503bb7b1f433a5fe9bac052 0 {'date': '* *', 'user': 'test'} (glob) |
|
281
258169d3428b
test-stabilize-order.t: trace obsolete markers
Patrick Mezard <patrick@mezard.eu>
parents:
269
diff
changeset
|
109 |
[1] |
|
742
760d01a549a6
amend: use core mechanism for amend
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
713
diff
changeset
|
110 |
|
|
760d01a549a6
amend: use core mechanism for amend
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
713
diff
changeset
|
111 |
|
|
760d01a549a6
amend: use core mechanism for amend
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
713
diff
changeset
|
112 |
|
|
269
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
113 |
$ glog |
|
742
760d01a549a6
amend: use core mechanism for amend
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
713
diff
changeset
|
114 |
@ 9:65095d7d0dd5@default(draft) addc |
|
269
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
115 |
| |
|
742
760d01a549a6
amend: use core mechanism for amend
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
713
diff
changeset
|
116 |
o 8:bede829dd2d3@default(draft) addb |
|
269
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
117 |
| |
|
742
760d01a549a6
amend: use core mechanism for amend
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
713
diff
changeset
|
118 |
o 7:005fe5914f78@default(draft) adda |
|
269
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
119 |
| |
|
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
120 |
o 0:c471ef929e6a@default(draft) addroot |
|
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
121 |
|
|
492
7ecd41520dae
rename `stabilize` to `evolve`
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
491
diff
changeset
|
122 |
$ hg evolve -v |
|
713
e10fdb190aa1
evolve: update stabilize order test after output change
Levi Bard <levi@unity3d.com>
parents:
699
diff
changeset
|
123 |
no troubled changesets |
|
269
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
124 |
[1] |
|
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
125 |
|
|
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
126 |
Test behaviour with --any |
|
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
127 |
|
|
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
128 |
$ hg up 8 |
|
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
129 |
0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
130 |
$ echo b >> b |
|
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
131 |
$ hg amend |
| 486 | 132 |
1 new unstable changesets |
|
269
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
133 |
$ glog |
|
742
760d01a549a6
amend: use core mechanism for amend
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
713
diff
changeset
|
134 |
@ 11:036cf654e942@default(draft) addb |
|
269
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
135 |
| |
|
742
760d01a549a6
amend: use core mechanism for amend
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
713
diff
changeset
|
136 |
| o 9:65095d7d0dd5@default(draft) addc |
|
269
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
137 |
| | |
|
742
760d01a549a6
amend: use core mechanism for amend
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
713
diff
changeset
|
138 |
| x 8:bede829dd2d3@default(draft) addb |
|
269
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
139 |
|/ |
|
742
760d01a549a6
amend: use core mechanism for amend
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
713
diff
changeset
|
140 |
o 7:005fe5914f78@default(draft) adda |
|
269
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
141 |
| |
|
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
142 |
o 0:c471ef929e6a@default(draft) addroot |
|
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
143 |
|
|
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
144 |
$ hg up 9 |
|
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
145 |
2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
492
7ecd41520dae
rename `stabilize` to `evolve`
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
491
diff
changeset
|
146 |
$ hg evolve -v |
|
7ecd41520dae
rename `stabilize` to `evolve`
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
491
diff
changeset
|
147 |
nothing to evolve here |
|
468
6b1b6d338478
stabilize: rework stabilize code to allow selection of latecomer and conflicting
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
443
diff
changeset
|
148 |
(1 troubled changesets, do you want --any ?) |
|
269
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
149 |
[2] |
|
492
7ecd41520dae
rename `stabilize` to `evolve`
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
491
diff
changeset
|
150 |
$ hg evolve --any -v |
|
269
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
151 |
move:[9] addc |
|
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
152 |
atop:[11] addb |
|
742
760d01a549a6
amend: use core mechanism for amend
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
713
diff
changeset
|
153 |
hg rebase -r 65095d7d0dd5 -d 036cf654e942 |
|
269
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
154 |
resolving manifests |
|
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
155 |
removing c |
|
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
156 |
getting b |
|
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
157 |
resolving manifests |
|
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
158 |
getting c |
|
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
159 |
c |
|
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
160 |
$ glog |
|
742
760d01a549a6
amend: use core mechanism for amend
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
713
diff
changeset
|
161 |
@ 12:e99ecf51c867@default(draft) addc |
|
269
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
162 |
| |
|
742
760d01a549a6
amend: use core mechanism for amend
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
713
diff
changeset
|
163 |
o 11:036cf654e942@default(draft) addb |
|
269
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
164 |
| |
|
742
760d01a549a6
amend: use core mechanism for amend
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
713
diff
changeset
|
165 |
o 7:005fe5914f78@default(draft) adda |
|
269
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
166 |
| |
|
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
167 |
o 0:c471ef929e6a@default(draft) addroot |
|
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
168 |
|
|
492
7ecd41520dae
rename `stabilize` to `evolve`
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
491
diff
changeset
|
169 |
$ hg evolve --any -v |
|
713
e10fdb190aa1
evolve: update stabilize order test after output change
Levi Bard <levi@unity3d.com>
parents:
699
diff
changeset
|
170 |
no troubled changesets |
|
269
6c6bb7a23bb5
stabilize: improve unstable selection heuristic
Patrick Mezard <patrick@mezard.eu>
parents:
diff
changeset
|
171 |
[1] |