Show More
@@ -500,7 +500,7 b' Test that amend does not make it easy to' | |||||
500 | $ hg id |
|
500 | $ hg id | |
501 | b99e5df575f7 (a) tip |
|
501 | b99e5df575f7 (a) tip | |
502 |
|
502 | |||
503 | Test ui.prevent-unstable |
|
503 | Test that rewriting leaving instability behind is allowed | |
504 | --------------------------------------------------------------------- |
|
504 | --------------------------------------------------------------------- | |
505 |
|
505 | |||
506 | $ hg up '.^' |
|
506 | $ hg up '.^' |
@@ -143,8 +143,8 b' Check that histedit respect phases' | |||||
143 | [255] |
|
143 | [255] | |
144 |
|
144 | |||
145 |
|
145 | |||
146 | +Test ui.prevent-unstable option |
|
146 | Test that rewriting leaving instability behind is allowed | |
147 |
|
|
147 | --------------------------------------------------------------------- | |
148 |
|
148 | |||
149 | $ hg up '.^' |
|
149 | $ hg up '.^' | |
150 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
150 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
@@ -279,8 +279,8 b' not be rebased.' | |||||
279 | 32af7686d403cf45b5d95f2d70cebea587ac806a cf44d2f5a9f4297a62be94cbdd3dff7c7dc54258 0 {'date': '*', 'user': 'test'} (glob) |
|
279 | 32af7686d403cf45b5d95f2d70cebea587ac806a cf44d2f5a9f4297a62be94cbdd3dff7c7dc54258 0 {'date': '*', 'user': 'test'} (glob) | |
280 | 42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 7c6027df6a99d93f461868e5433f63bde20b6dfb 0 {'date': '*', 'user': 'test'} (glob) |
|
280 | 42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 7c6027df6a99d93f461868e5433f63bde20b6dfb 0 {'date': '*', 'user': 'test'} (glob) | |
281 |
|
281 | |||
282 | Test ui.prevent-unstable option |
|
282 | Test that rewriting leaving instability behind is allowed | |
283 | ------------------------------------ |
|
283 | --------------------------------------------------------------------- | |
284 |
|
284 | |||
285 | $ hg log -r 'children(8)' |
|
285 | $ hg log -r 'children(8)' | |
286 | 9:cf44d2f5a9f4 D (no-eol) |
|
286 | 9:cf44d2f5a9f4 D (no-eol) |
General Comments 0
You need to be logged in to leave comments.
Login now