equal
deleted
inserted
replaced
116 o 7:f5ff10856e5a@default(draft) adda |
116 o 7:f5ff10856e5a@default(draft) adda |
117 | |
117 | |
118 o 0:c471ef929e6a@default(draft) addroot |
118 o 0:c471ef929e6a@default(draft) addroot |
119 |
119 |
120 $ hg stabilize -v |
120 $ hg stabilize -v |
121 no unstable changeset |
121 no troubled changeset |
122 [1] |
122 [1] |
123 |
123 |
124 Test behaviour with --any |
124 Test behaviour with --any |
125 |
125 |
126 $ hg up 8 |
126 $ hg up 8 |
141 |
141 |
142 $ hg up 9 |
142 $ hg up 9 |
143 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
143 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
144 $ hg stabilize -v |
144 $ hg stabilize -v |
145 nothing to stabilize here |
145 nothing to stabilize here |
146 (1 unstable changesets, do you want --any ?) |
146 (1 troubled changesets, do you want --any ?) |
147 [2] |
147 [2] |
148 $ hg stabilize --any -v |
148 $ hg stabilize --any -v |
149 move:[9] addc |
149 move:[9] addc |
150 atop:[11] addb |
150 atop:[11] addb |
151 hg rebase -Dr 5e819fbb0d27 -d 4e7cec6b4afe |
151 hg rebase -Dr 5e819fbb0d27 -d 4e7cec6b4afe |
163 o 7:f5ff10856e5a@default(draft) adda |
163 o 7:f5ff10856e5a@default(draft) adda |
164 | |
164 | |
165 o 0:c471ef929e6a@default(draft) addroot |
165 o 0:c471ef929e6a@default(draft) addroot |
166 |
166 |
167 $ hg stabilize --any -v |
167 $ hg stabilize --any -v |
168 no unstable changeset |
168 no troubled changeset |
169 [1] |
169 [1] |