Mercurial > evolve
comparison tests/test-exchange-obsmarkers-case-A3.t @ 6809:9903ee44e658 mercurial-5.6
test-compat: merge mercurial-5.7 into mercurial-5.6
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Wed, 26 Jun 2024 18:09:37 +0400 |
| parents | 08c30eef85d3 |
| children | 669270305ccb |
comparison
equal
deleted
inserted
replaced
| 6808:c7d3e1d8c6f1 | 6809:9903ee44e658 |
|---|---|
| 227 | 227 |
| 228 $ cd A.3.b | 228 $ cd A.3.b |
| 229 $ hg push -R main -r 'desc(A1)' pushdest | 229 $ hg push -R main -r 'desc(A1)' pushdest |
| 230 pushing to pushdest | 230 pushing to pushdest |
| 231 searching for changes | 231 searching for changes |
| 232 abort: push creates new remote head e5ea8f9c7314 | 232 abort: push creates new remote head e5ea8f9c7314! |
| 233 (merge or see 'hg help push' for details about pushing new heads) | 233 (merge or see 'hg help push' for details about pushing new heads) |
| 234 [20] | 234 [255] |
| 235 $ cd .. | 235 $ cd .. |
| 236 | 236 |
| 237 test obsmarkers exchange. | 237 test obsmarkers exchange. |
| 238 | 238 |
| 239 $ dotest A.3.b A1 -f | 239 $ dotest A.3.b A1 -f |