Mercurial > evolve
comparison tests/test-topic-flow-single-head.t @ 6401:716912541759 mercurial-5.0
test-compat: merge mercurial-5.1 into mercurial-5.0
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Tue, 07 Feb 2023 10:51:10 +0400 |
| parents | b1d010b2e6c4 |
| children |
comparison
equal
deleted
inserted
replaced
| 6355:4cf673319dfc | 6401:716912541759 |
|---|---|
| 146 adding manifests | 146 adding manifests |
| 147 adding file changes | 147 adding file changes |
| 148 added 1 changesets with 1 changes to 1 files (+1 heads) | 148 added 1 changesets with 1 changes to 1 files (+1 heads) |
| 149 transaction abort! | 149 transaction abort! |
| 150 rollback completed | 150 rollback completed |
| 151 abort: 2 heads on "default:bar" | 151 abort: 2 heads on "default//bar" |
| 152 (5194f5dcd542, 48a01453c1c5) | 152 (5194f5dcd542, 48a01453c1c5) |
| 153 [255] | 153 [255] |
| 154 | 154 |
| 155 merge works fine | 155 merge works fine |
| 156 | 156 |