54 Unlike the previous way of handling such changes, by stripping the old |
54 Unlike the previous way of handling such changes, by stripping the old |
55 changesets from the repository, obsolescence markers can be propagated |
55 changesets from the repository, obsolescence markers can be propagated |
56 between repositories. This allows for a safe and simple way of exchanging |
56 between repositories. This allows for a safe and simple way of exchanging |
57 mutable history and altering it after the fact. Changeset phases are |
57 mutable history and altering it after the fact. Changeset phases are |
58 respected, such that only draft and secret changesets can be altered (see |
58 respected, such that only draft and secret changesets can be altered (see |
59 'hg help phases' for details). |
59 "hg help phases" for details). |
60 |
60 |
61 Obsolescence is tracked using "obsolete markers", a piece of metadata |
61 Obsolescence is tracked using "obsolete markers", a piece of metadata |
62 tracking which changesets have been made obsolete, potential successors |
62 tracking which changesets have been made obsolete, potential successors |
63 for a given changeset, the moment the changeset was marked as obsolete, |
63 for a given changeset, the moment the changeset was marked as obsolete, |
64 and the user who performed the rewriting operation. The markers are stored |
64 and the user who performed the rewriting operation. The markers are stored |
600 $ hg log -r7 --template '{rev}:{node|short} {obsolete}\n' |
600 $ hg log -r7 --template '{rev}:{node|short} {obsolete}\n' |
601 7:a5bfd90a2f29 |
601 7:a5bfd90a2f29 |
602 $ echo 3 > 1 |
602 $ echo 3 > 1 |
603 $ hg resolve -m 1 |
603 $ hg resolve -m 1 |
604 (no more unresolved files) |
604 (no more unresolved files) |
605 continue: hg graft --continue |
|
606 $ hg graft --continue -O |
605 $ hg graft --continue -O |
607 grafting 7:a5bfd90a2f29 "conflict" (tip) |
606 grafting 7:a5bfd90a2f29 "conflict" (tip) |
608 $ glog --hidden |
607 $ glog --hidden |
609 @ 8:920e58bb443b@default(draft) conflict |
608 @ 8:920e58bb443b@default(draft) conflict |
610 | |
609 | |