equal
deleted
inserted
replaced
70 getting b |
70 getting b |
71 committing files: |
71 committing files: |
72 b |
72 b |
73 committing manifest |
73 committing manifest |
74 committing changelog |
74 committing changelog |
75 working directory is now at 81b8bbcd5892 |
75 resolving manifests |
76 $ glog |
76 removing b |
77 @ 6:81b8bbcd5892@default(draft) addb |
77 $ glog |
78 | |
78 o 6:81b8bbcd5892@default(draft) addb |
79 o 5:005fe5914f78@default(draft) adda |
79 | |
|
80 @ 5:005fe5914f78@default(draft) adda |
80 | |
81 | |
81 | * 3:7a7552255fb5@default(draft) addc |
82 | * 3:7a7552255fb5@default(draft) addc |
82 | | |
83 | | |
83 | x 2:ef23d6ef94d6@default(draft) addb |
84 | x 2:ef23d6ef94d6@default(draft) addb |
84 | | |
85 | | |
87 o 0:c471ef929e6a@default(draft) addroot |
88 o 0:c471ef929e6a@default(draft) addroot |
88 |
89 |
89 |
90 |
90 Test stabilizing a descendant predecessor's child |
91 Test stabilizing a descendant predecessor's child |
91 |
92 |
92 $ hg up -r 005fe5914f78 |
|
93 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
94 $ hg debugobsolete > successors.old |
93 $ hg debugobsolete > successors.old |
95 $ hg evolve -v --update |
94 $ hg evolve -v --update |
96 move:[3] addc |
95 move:[3] addc |
97 atop:[6] addb |
96 atop:[6] addb |
98 hg rebase -r 7a7552255fb5 -d 81b8bbcd5892 |
97 hg rebase -r 7a7552255fb5 -d 81b8bbcd5892 |