|
@@
-27,7
+27,7
b' Enable obsolete'
|
|
27
|
> hg ci -m "$1"
|
|
27
|
> hg ci -m "$1"
|
|
28
|
> }
|
|
28
|
> }
|
|
29
|
$ getid() {
|
|
29
|
$ getid() {
|
|
30
|
> hg id --debug --hidden -ir "desc('$1')"
|
|
30
|
> hg log --hidden -r "desc('$1')" -T '{node}\n'
|
|
31
|
> }
|
|
31
|
> }
|
|
32
|
|
|
32
|
|
|
33
|
setup repo
|
|
33
|
setup repo
|
|
@@
-62,7
+62,6
b' A_1 have two direct and divergent succes'
|
|
62
|
$ newcase direct
|
|
62
|
$ newcase direct
|
|
63
|
$ hg debugobsolete `getid A_0` `getid A_1`
|
|
63
|
$ hg debugobsolete `getid A_0` `getid A_1`
|
|
64
|
$ hg debugobsolete `getid A_0` `getid A_2`
|
|
64
|
$ hg debugobsolete `getid A_0` `getid A_2`
|
|
65
|
invalid branchheads cache (served): tip differs
|
|
|
|
|
66
|
$ hg log -G --hidden
|
|
65
|
$ hg log -G --hidden
|
|
67
|
o 3:392fd25390da A_2
|
|
66
|
o 3:392fd25390da A_2
|
|
68
|
|
|
|
67
|
|
|
|
@@
-104,7
+103,6
b' indirect divergence with known changeset'
|
|
104
|
$ newcase indirect_known
|
|
103
|
$ newcase indirect_known
|
|
105
|
$ hg debugobsolete `getid A_0` `getid A_1`
|
|
104
|
$ hg debugobsolete `getid A_0` `getid A_1`
|
|
106
|
$ hg debugobsolete `getid A_0` `getid A_2`
|
|
105
|
$ hg debugobsolete `getid A_0` `getid A_2`
|
|
107
|
invalid branchheads cache (served): tip differs
|
|
|
|
|
108
|
$ mkcommit A_3
|
|
106
|
$ mkcommit A_3
|
|
109
|
created new head
|
|
107
|
created new head
|
|
110
|
$ hg debugobsolete `getid A_2` `getid A_3`
|
|
108
|
$ hg debugobsolete `getid A_2` `getid A_3`
|
|
@@
-143,7
+141,6
b' indirect divergence with known changeset'
|
|
143
|
$ newcase indirect_unknown
|
|
141
|
$ newcase indirect_unknown
|
|
144
|
$ hg debugobsolete `getid A_0` aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
|
|
142
|
$ hg debugobsolete `getid A_0` aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
|
|
145
|
$ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid A_1`
|
|
143
|
$ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid A_1`
|
|
146
|
invalid branchheads cache (served): tip differs
|
|
|
|
|
147
|
$ hg debugobsolete `getid A_0` `getid A_2`
|
|
144
|
$ hg debugobsolete `getid A_0` `getid A_2`
|
|
148
|
$ hg log -G --hidden
|
|
145
|
$ hg log -G --hidden
|
|
149
|
o 3:392fd25390da A_2
|
|
146
|
o 3:392fd25390da A_2
|
|
@@
-175,7
+172,6
b' do not take unknown node in account if t'
|
|
175
|
$ newcase final-unknown
|
|
172
|
$ newcase final-unknown
|
|
176
|
$ hg debugobsolete `getid A_0` `getid A_1`
|
|
173
|
$ hg debugobsolete `getid A_0` `getid A_1`
|
|
177
|
$ hg debugobsolete `getid A_1` `getid A_2`
|
|
174
|
$ hg debugobsolete `getid A_1` `getid A_2`
|
|
178
|
invalid branchheads cache (served): tip differs
|
|
|
|
|
179
|
$ hg debugobsolete `getid A_0` bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
|
|
175
|
$ hg debugobsolete `getid A_0` bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
|
|
180
|
$ hg debugobsolete bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb cccccccccccccccccccccccccccccccccccccccc
|
|
176
|
$ hg debugobsolete bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb cccccccccccccccccccccccccccccccccccccccc
|
|
181
|
$ hg debugobsolete `getid A_1` dddddddddddddddddddddddddddddddddddddddd
|
|
177
|
$ hg debugobsolete `getid A_1` dddddddddddddddddddddddddddddddddddddddd
|
|
@@
-192,7
+188,6
b' divergence that converge again is not di'
|
|
192
|
$ newcase converged_divergence
|
|
188
|
$ newcase converged_divergence
|
|
193
|
$ hg debugobsolete `getid A_0` `getid A_1`
|
|
189
|
$ hg debugobsolete `getid A_0` `getid A_1`
|
|
194
|
$ hg debugobsolete `getid A_0` `getid A_2`
|
|
190
|
$ hg debugobsolete `getid A_0` `getid A_2`
|
|
195
|
invalid branchheads cache (served): tip differs
|
|
|
|
|
196
|
$ mkcommit A_3
|
|
191
|
$ mkcommit A_3
|
|
197
|
created new head
|
|
192
|
created new head
|
|
198
|
$ hg debugobsolete `getid A_1` `getid A_3`
|
|
193
|
$ hg debugobsolete `getid A_1` `getid A_3`
|
|
@@
-439,7
+434,6
b' successors-set. (report [A,B] not [A] + '
|
|
439
|
$ newcase subset
|
|
434
|
$ newcase subset
|
|
440
|
$ hg debugobsolete `getid A_0` `getid A_2`
|
|
435
|
$ hg debugobsolete `getid A_0` `getid A_2`
|
|
441
|
$ hg debugobsolete `getid A_0` `getid A_1` `getid A_2`
|
|
436
|
$ hg debugobsolete `getid A_0` `getid A_1` `getid A_2`
|
|
442
|
invalid branchheads cache (served): tip differs
|
|
|
|
|
443
|
$ hg debugsuccessorssets --hidden 'desc('A_0')'
|
|
437
|
$ hg debugsuccessorssets --hidden 'desc('A_0')'
|
|
444
|
007dc284c1f8
|
|
438
|
007dc284c1f8
|
|
445
|
82623d38b9ba 392fd25390da
|
|
439
|
82623d38b9ba 392fd25390da
|