Show More
@@ -58,7 +58,7 b' def read(repo):' | |||
|
58 | 58 | if repo.filtername is not None: |
|
59 | 59 | msg += ' (%s)' % repo.filtername |
|
60 | 60 | msg += ': %s\n' |
|
61 |
repo.ui. |
|
|
61 | repo.ui.debug(msg % inst) | |
|
62 | 62 | partial = None |
|
63 | 63 | return partial |
|
64 | 64 |
@@ -2314,6 +2314,7 b' def debugobsolete(ui, repo, precursor=No' | |||
|
2314 | 2314 | """create arbitrary obsolete marker |
|
2315 | 2315 | |
|
2316 | 2316 | With no arguments, displays the list of obsolescence markers.""" |
|
2317 | ||
|
2317 | 2318 | def parsenodeid(s): |
|
2318 | 2319 | try: |
|
2319 | 2320 | # We do not use revsingle/revrange functions here to accept |
@@ -507,7 +507,6 b' amend' | |||
|
507 | 507 | $ hg -q commit -d '14 1' -m 'prepare amend' |
|
508 | 508 | |
|
509 | 509 | $ hg --debug commit --amend -d '15 1' -m 'amend without changes' | grep keywords |
|
510 | invalid branchheads cache (served): tip differs | |
|
511 | 510 | overwriting a expanding keywords |
|
512 | 511 | $ hg -q id |
|
513 | 512 | 67d8c481a6be |
@@ -27,7 +27,7 b' Enable obsolete' | |||
|
27 | 27 | > hg ci -m "$1" |
|
28 | 28 | > } |
|
29 | 29 | $ getid() { |
|
30 |
> hg |
|
|
30 | > hg log --hidden -r "desc('$1')" -T '{node}\n' | |
|
31 | 31 | > } |
|
32 | 32 | |
|
33 | 33 | setup repo |
@@ -62,7 +62,6 b' A_1 have two direct and divergent succes' | |||
|
62 | 62 | $ newcase direct |
|
63 | 63 | $ hg debugobsolete `getid A_0` `getid A_1` |
|
64 | 64 | $ hg debugobsolete `getid A_0` `getid A_2` |
|
65 | invalid branchheads cache (served): tip differs | |
|
66 | 65 | $ hg log -G --hidden |
|
67 | 66 | o 3:392fd25390da A_2 |
|
68 | 67 | | |
@@ -104,7 +103,6 b' indirect divergence with known changeset' | |||
|
104 | 103 | $ newcase indirect_known |
|
105 | 104 | $ hg debugobsolete `getid A_0` `getid A_1` |
|
106 | 105 | $ hg debugobsolete `getid A_0` `getid A_2` |
|
107 | invalid branchheads cache (served): tip differs | |
|
108 | 106 | $ mkcommit A_3 |
|
109 | 107 | created new head |
|
110 | 108 | $ hg debugobsolete `getid A_2` `getid A_3` |
@@ -143,7 +141,6 b' indirect divergence with known changeset' | |||
|
143 | 141 | $ newcase indirect_unknown |
|
144 | 142 | $ hg debugobsolete `getid A_0` aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa |
|
145 | 143 | $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid A_1` |
|
146 | invalid branchheads cache (served): tip differs | |
|
147 | 144 | $ hg debugobsolete `getid A_0` `getid A_2` |
|
148 | 145 | $ hg log -G --hidden |
|
149 | 146 | o 3:392fd25390da A_2 |
@@ -175,7 +172,6 b' do not take unknown node in account if t' | |||
|
175 | 172 | $ newcase final-unknown |
|
176 | 173 | $ hg debugobsolete `getid A_0` `getid A_1` |
|
177 | 174 | $ hg debugobsolete `getid A_1` `getid A_2` |
|
178 | invalid branchheads cache (served): tip differs | |
|
179 | 175 | $ hg debugobsolete `getid A_0` bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb |
|
180 | 176 | $ hg debugobsolete bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb cccccccccccccccccccccccccccccccccccccccc |
|
181 | 177 | $ hg debugobsolete `getid A_1` dddddddddddddddddddddddddddddddddddddddd |
@@ -192,7 +188,6 b' divergence that converge again is not di' | |||
|
192 | 188 | $ newcase converged_divergence |
|
193 | 189 | $ hg debugobsolete `getid A_0` `getid A_1` |
|
194 | 190 | $ hg debugobsolete `getid A_0` `getid A_2` |
|
195 | invalid branchheads cache (served): tip differs | |
|
196 | 191 | $ mkcommit A_3 |
|
197 | 192 | created new head |
|
198 | 193 | $ hg debugobsolete `getid A_1` `getid A_3` |
@@ -439,7 +434,6 b' successors-set. (report [A,B] not [A] + ' | |||
|
439 | 434 | $ newcase subset |
|
440 | 435 | $ hg debugobsolete `getid A_0` `getid A_2` |
|
441 | 436 | $ hg debugobsolete `getid A_0` `getid A_1` `getid A_2` |
|
442 | invalid branchheads cache (served): tip differs | |
|
443 | 437 | $ hg debugsuccessorssets --hidden 'desc('A_0')' |
|
444 | 438 | 007dc284c1f8 |
|
445 | 439 | 82623d38b9ba 392fd25390da |
General Comments 0
You need to be logged in to leave comments.
Login now