Show More
@@ -145,7 +145,7 b' def _find_new_divergence(repo, revs):' | |||||
145 | for r in obsrevs: |
|
145 | for r in obsrevs: | |
146 | div = find_new_divergence_from(repo, repo[r]) |
|
146 | div = find_new_divergence_from(repo, repo[r]) | |
147 | if div: |
|
147 | if div: | |
148 | return (repo[r], repo[div[0]], repo[div[1]]) |
|
148 | return (repo[r], repo[div[0]], repo.unfiltered()[div[1]]) | |
149 | return None |
|
149 | return None | |
150 |
|
150 | |||
151 |
|
151 |
@@ -273,8 +273,8 b' Make the common predecessor (C) pruned' | |||||
273 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
273 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
274 | Try to cause divergence |
|
274 | Try to cause divergence | |
275 | $ hg amend -m C11 |
|
275 | $ hg amend -m C11 | |
276 | abort: filtered revision '26805aba1e600a82e93661149f2313866a221a7b' (known-bad-output !) |
|
276 | abort: cannot amend 2758767f5d17, as that creates content-divergence with bfcb433a0dea, from 26805aba1e60 | |
277 | [255] |
|
277 | (add --verbose for details or see 'hg help evolution.instability') | |
278 | [10] |
|
278 | [10] | |
279 | #endif |
|
279 | #endif | |
280 |
|
280 |
General Comments 0
You need to be logged in to leave comments.
Login now