tests/test-tutorial.t
branchstable
changeset 774 03844e1fbfe6
parent 773 fc8034069fe1
child 803 b96d51a357bd
equal deleted inserted replaced
773:fc8034069fe1 774:03844e1fbfe6
   332   o  9ca060c80d74 (public): SPAM
   332   o  9ca060c80d74 (public): SPAM
   333   |
   333   |
   334   o  7e82d3f3c2cb (public): Monthy Python Shopping list
   334   o  7e82d3f3c2cb (public): Monthy Python Shopping list
   335   
   335   
   336 
   336 
   337 .. note: We can't amend changeset 7e82d3f3c2cb or 9ca060c80d74 as they are immutable.
   337 .. note:: We can't amend changeset 7e82d3f3c2cb or 9ca060c80d74 as they are immutable.
   338 
   338 
   339  I now want to push to remote all my changes except the bathroom one, which I'm
   339  I now want to push to remote all my changes except the bathroom one, which I'm
   340  not totally happy with yet. To be able to push "SPAM SPAM" I need a version of
   340  not totally happy with yet. To be able to push "SPAM SPAM" I need a version of
   341  "SPAM SPAM" which is not a child of "bathroom stuff"
   341  "SPAM SPAM" which is not a child of "bathroom stuff"
   342 
   342 
   615   
   615   
   616 
   616 
   617 
   617 
   618 When we pull from remote again we get an unstable state!
   618 When we pull from remote again we get an unstable state!
   619 
   619 
   620 
       
   621   $ hg pull remote
   620   $ hg pull remote
   622   pulling from $TESTTMP/remote
   621   pulling from $TESTTMP/remote
   623   searching for changes
   622   searching for changes
   624   adding changesets
   623   adding changesets
   625   adding manifests
   624   adding manifests