equal
deleted
inserted
replaced
1206 adding changesets |
1206 adding changesets |
1207 adding manifests |
1207 adding manifests |
1208 adding file changes |
1208 adding file changes |
1209 added 1 changesets with 1 changes to 1 files (+1 heads) |
1209 added 1 changesets with 1 changes to 1 files (+1 heads) |
1210 (run 'hg heads' to see heads, 'hg merge' to merge) |
1210 (run 'hg heads' to see heads, 'hg merge' to merge) |
1211 1 new orphan changesets |
1211 1 new unstable changesets |
1212 |
1212 |
1213 |
1213 |
1214 The new changeset "animal" is based on an old changeset of "bathroom". You can |
1214 The new changeset "animal" is based on an old changeset of "bathroom". You can |
1215 see both version showing up in the log. |
1215 see both version showing up in the log. |
1216 |
1216 |
1351 share it with the outside: |
1351 share it with the outside: |
1352 |
1352 |
1353 $ hg push other |
1353 $ hg push other |
1354 pushing to $TESTTMP/other (glob) |
1354 pushing to $TESTTMP/other (glob) |
1355 searching for changes |
1355 searching for changes |
1356 abort: push includes orphan changeset: bf1b0d202029! |
1356 abort: push includes unstable changeset: bf1b0d202029! |
1357 (use 'hg evolve' to get a stable history or --force to ignore warnings) |
1357 (use 'hg evolve' to get a stable history or --force to ignore warnings) |
1358 [255] |
1358 [255] |
1359 |
1359 |
1360 |
1360 |
1361 To resolve this unstable state, you need to rebase bf1b0d202029 onto |
1361 To resolve this unstable state, you need to rebase bf1b0d202029 onto |
1669 |
1669 |
1670 $ hg prune ee942144f952 |
1670 $ hg prune ee942144f952 |
1671 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1671 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1672 working directory now at a44c85f957d3 |
1672 working directory now at a44c85f957d3 |
1673 1 changesets pruned |
1673 1 changesets pruned |
1674 1 new orphan changesets |
1674 1 new unstable changesets |
1675 |
1675 |
1676 |
1676 |
1677 The animals changeset is still displayed because the "SPAM SPAM SPAM" changeset |
1677 The animals changeset is still displayed because the "SPAM SPAM SPAM" changeset |
1678 is neither dead or obsolete. My repository is in an unstable state again. |
1678 is neither dead or obsolete. My repository is in an unstable state again. |
1679 |
1679 |