equal
deleted
inserted
replaced
29 $ hg amend -m changea |
29 $ hg amend -m changea |
30 1 new unstable changesets |
30 1 new unstable changesets |
31 $ hg evolve -v |
31 $ hg evolve -v |
32 move:[2] changea |
32 move:[2] changea |
33 atop:[4] changea |
33 atop:[4] changea |
34 hg rebase -Dr cce2c55b8965 -d 1447e1c4828d |
34 hg rebase -r cce2c55b8965 -d 1447e1c4828d |
35 resolving manifests |
35 resolving manifests |
36 $ glog --hidden |
36 $ glog --hidden |
37 @ 4:1447e1c4828d@default(draft) bk:[changea] changea |
37 @ 4:1447e1c4828d@default(draft) bk:[changea] changea |
38 | |
38 | |
39 | x 3:41ad4fe8c795@default(draft) bk:[] amends 102a90ea7b4a3361e4082ed620918c261189a36a |
39 | x 3:41ad4fe8c795@default(draft) bk:[] amends 102a90ea7b4a3361e4082ed620918c261189a36a |
147 Stabilize ! |
147 Stabilize ! |
148 |
148 |
149 $ hg evolve --any --dry-run |
149 $ hg evolve --any --dry-run |
150 recreate:[12] newer a |
150 recreate:[12] newer a |
151 atop:[8] newer a |
151 atop:[8] newer a |
152 hg rebase --rev 15c83af6f3a3 --detach e8cc1b534401; |
152 hg rebase --rev 15c83af6f3a3 --dest e8cc1b534401; |
153 hg update e3183e9c0961; |
153 hg update e3183e9c0961; |
154 hg revert --all --rev 15c83af6f3a3; |
154 hg revert --all --rev 15c83af6f3a3; |
155 hg commit --msg "latecomer update to %s" (no-eol) |
155 hg commit --msg "latecomer update to %s" (no-eol) |
156 $ hg evolve --any |
156 $ hg evolve --any |
157 recreate:[12] newer a |
157 recreate:[12] newer a |