equal
deleted
inserted
replaced
205 +Apple |
205 +Apple |
206 |
206 |
207 Getting rid of branchy history |
207 Getting rid of branchy history |
208 ---------------------------------- |
208 ---------------------------------- |
209 |
209 |
210 While I was working on my list. someone help made a change remotly. |
210 While I was working on my list. someone made a change remotly. |
211 |
211 |
212 $ cd ../remote |
212 $ cd ../remote |
213 $ hg up -q |
213 $ hg up -q |
214 $ sed -i'' -e 's/Spam/Spam Spam Spam/' shopping |
214 $ sed -i'' -e 's/Spam/Spam Spam Spam/' shopping |
215 $ hg ci -m 'SPAM' |
215 $ hg ci -m 'SPAM' |
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 not |
339 I now want to push to remote all my changes except the bathroom one, which I'm |
340 totally happy with yet. To be able to push "SPAM SPAM" I need a version of "SPAM SPAM" which is not a child of |
340 not totally happy with yet. To be able to push "SPAM SPAM" I need a version of |
341 "bathroom stuff" |
341 "SPAM SPAM" which is not a child of "bathroom stuff" |
342 |
342 |
343 You can use 'rebase -r' or 'grab' for that: |
343 You can use 'rebase -r' or 'grab' for that: |
344 |
344 |
345 $ hg up 'p1(10b8aeaa8cc8)' # going on "bathroom stuff" parent |
345 $ hg up 'p1(10b8aeaa8cc8)' # going on "bathroom stuff" parent |
346 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
346 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
400 adding changesets |
400 adding changesets |
401 adding manifests |
401 adding manifests |
402 adding file changes |
402 adding file changes |
403 added 3 changesets with 3 changes to 1 files |
403 added 3 changesets with 3 changes to 1 files |
404 |
404 |
405 for simplicity shake we get the bathroom change in line again |
405 for simplicity sake we get the bathroom change in line again |
406 |
406 |
407 $ hg rebase -r 10b8aeaa8cc8 -d a224f2a4fb9f |
407 $ hg rebase -r 10b8aeaa8cc8 -d a224f2a4fb9f |
408 merging shopping |
408 merging shopping |
409 $ hg up tip |
409 $ hg up tip |
410 ? files updated, 0 files merged, 0 files removed, 0 files unresolved (glob) |
410 ? files updated, 0 files merged, 0 files removed, 0 files unresolved (glob) |
487 ----------------------- |
487 ----------------------- |
488 Collaboration |
488 Collaboration |
489 ----------------------- |
489 ----------------------- |
490 |
490 |
491 |
491 |
492 sharing mutable changeset |
492 sharing mutable changesets |
493 ---------------------------- |
493 ---------------------------- |
494 |
494 |
495 To share mutable changeset with others, just check that the repo you interact |
495 To share mutable changesets with others, just check that the repo you interact |
496 with is "not publishing". Otherwise you will get the previously observe |
496 with is "not publishing". Otherwise you will get the previously observe |
497 behavior where exchanged changeset are automatically published. |
497 behavior where exchanged changeset are automatically published. |
498 |
498 |
499 $ cd ../remote |
499 $ cd ../remote |
500 $ hg -R ../local/ showconfig phases |
500 $ hg -R ../local/ showconfig phases |
665 |
665 |
666 |
666 |
667 |
667 |
668 |
668 |
669 To resolve this unstable state, you need to rebase bf1b0d202029 onto |
669 To resolve this unstable state, you need to rebase bf1b0d202029 onto |
670 a44c85f957d3. The "hg evolve" command will do this for you. |
670 a44c85f957d3. The `hg evolve` command will do this for you. |
671 |
671 |
672 It has a --dry-run option to only suggest the next move. |
672 It has a --dry-run option to only suggest the next move. |
673 |
673 |
674 $ hg evolve --dry-run |
674 $ hg evolve --dry-run |
675 move:[15] animals |
675 move:[15] animals |