equal
deleted
inserted
replaced
97 grafting revision 5 |
97 grafting revision 5 |
98 |
98 |
99 Stabilize of late comer with different parent |
99 Stabilize of late comer with different parent |
100 ================================================== |
100 ================================================== |
101 |
101 |
102 (the with same parent is handled in test-evolve.t) |
102 (the same parent case is handled in test-evolve.t) |
103 |
103 |
104 $ glog |
104 $ glog |
105 @ 8:e3183e9c0961@default(draft) bk:[] newer a |
105 @ 8:e3183e9c0961@default(draft) bk:[] newer a |
106 | |
106 | |
107 o 7:e8cc1b534401@default(draft) bk:[changea] changea |
107 o 7:e8cc1b534401@default(draft) bk:[changea] changea |
169 o 7:e8cc1b534401@default(public) bk:[changea] changea |
169 o 7:e8cc1b534401@default(public) bk:[changea] changea |
170 | |
170 | |
171 o 0:07f494440405@default(public) bk:[] adda |
171 o 0:07f494440405@default(public) bk:[] adda |
172 |
172 |
173 |
173 |
174 Stabilize of conflicting changeset with same parent |
174 Stabilize conflicting changesets with same parent |
175 ==================================================== |
175 ================================================= |
176 |
176 |
177 $ rm a.orig |
177 $ rm a.orig |
178 $ hg up 9 |
178 $ hg up 9 |
179 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
179 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
180 $ cat << EOF >> a |
180 $ cat << EOF >> a |