89 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
89 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
90 |
90 |
91 Checking whether the bookmarks are moved or not |
91 Checking whether the bookmarks are moved or not |
92 |
92 |
93 $ hg log -G |
93 $ hg log -G |
94 @ 11 - 198b5c405d01 r5 [debugbuilddag] (draft) |
94 @ 11 - 198b5c405d01 r5 [debugbuilddag] (draft) bm1 |
95 | |
95 | |
96 | o 10 - a8407f9a3dc1 r10 [debugbuilddag] (draft) |
96 | o 10 - a8407f9a3dc1 r10 [debugbuilddag] (draft) |
97 | | |
97 | | |
98 | o 9 - 529dfc5bb875 r9 [debugbuilddag] (draft) |
98 | o 9 - 529dfc5bb875 r9 [debugbuilddag] (draft) |
99 | | |
99 | | |
100 | o 8 - abf57d94268b r8 [debugbuilddag] (draft) |
100 | o 8 - abf57d94268b r8 [debugbuilddag] (draft) |
101 | | |
101 | | |
102 | | x 7 - 4de32a90b66c r7 [debugbuilddag] (draft) bm1 |
102 o | 4 - bebd167eb94d r4 [debugbuilddag] (draft) |
103 | | | |
103 |/ |
104 | | x 6 - f69452c5b1af r6 [debugbuilddag] (draft) |
104 o 3 - 2dc09a01254d r3 [debugbuilddag] (draft) |
105 | | | |
105 | |
106 +---x 5 - c8d03c1b5e94 r5 [debugbuilddag] (draft) |
106 o 2 - 01241442b3c2 r2 [debugbuilddag] (draft) |
107 | | |
107 | |
108 o | 4 - bebd167eb94d r4 [debugbuilddag] (draft) |
108 o 1 - 66f7d451a68b r1 [debugbuilddag] (draft) |
109 |/ |
109 | |
110 o 3 - 2dc09a01254d r3 [debugbuilddag] (draft) |
110 o 0 - 1ea73414a91b r0 [debugbuilddag] (public) |
111 | |
111 |
112 o 2 - 01241442b3c2 r2 [debugbuilddag] (draft) |
|
113 | |
|
114 o 1 - 66f7d451a68b r1 [debugbuilddag] (draft) |
|
115 | |
|
116 o 0 - 1ea73414a91b r0 [debugbuilddag] (public) |
|
117 |
|
118 XXX: bookmark not moved, manually moving it (issue5772) |
|
119 $ hg bookmark -r . bm1 |
|
120 moving bookmark 'bm1' forward from 4de32a90b66c |
|
121 |
|
122 (test inherited from test-evolve.t) |
112 (test inherited from test-evolve.t) |
123 |
113 |
124 $ hg fold --from 6 # want to run hg fold 6 |
114 $ hg fold --from 6 # want to run hg fold 6 |
125 abort: hidden revision '6'! |
115 abort: hidden revision '6'! |
126 (use --hidden to access hidden revisions; successor: 198b5c405d01) |
116 (use --hidden to access hidden revisions; successor: 198b5c405d01) |
221 |
211 |
222 $ hg fold --exact 'desc("r5") + desc("r11")' --user 'Victor Rataxes <victor@rhino.savannah>' |
212 $ hg fold --exact 'desc("r5") + desc("r11")' --user 'Victor Rataxes <victor@rhino.savannah>' |
223 2 changesets folded |
213 2 changesets folded |
224 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
214 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
225 $ hg log -G |
215 $ hg log -G |
226 @ 14 - 29b470a33594 r5 [Victor Rataxes <victor@rhino.savannah>] (draft) |
216 @ 14 - 29b470a33594 r5 [Victor Rataxes <victor@rhino.savannah>] (draft) bm1 |
227 | |
217 | |
228 | x 13 - 14d0e0da8e91 r11 [test] (draft) bm1 |
218 | o 12 - b568edbee6e0 r8 [debugbuilddag] (draft) |
229 | | |
219 | | |
230 | | o 12 - b568edbee6e0 r8 [debugbuilddag] (draft) |
220 o | 4 - bebd167eb94d r4 [debugbuilddag] (draft) |
231 | | | |
|
232 | x | 11 - 198b5c405d01 r5 [debugbuilddag] (draft) |
|
233 |/ / |
|
234 o / 4 - bebd167eb94d r4 [debugbuilddag] (draft) |
|
235 |/ |
221 |/ |
236 o 3 - 2dc09a01254d r3 [debugbuilddag] (draft) |
222 o 3 - 2dc09a01254d r3 [debugbuilddag] (draft) |
237 | |
223 | |
238 o 2 - 01241442b3c2 r2 [debugbuilddag] (draft) |
224 o 2 - 01241442b3c2 r2 [debugbuilddag] (draft) |
239 | |
225 | |
244 |
230 |
245 $ hg fold --from 'desc("r4")' -U |
231 $ hg fold --from 'desc("r4")' -U |
246 2 changesets folded |
232 2 changesets folded |
247 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
233 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
248 $ hg log -G |
234 $ hg log -G |
249 @ 15 - 91880abed0f2 r4 [test] (draft) |
235 @ 15 - 91880abed0f2 r4 [test] (draft) bm1 |
250 | |
236 | |
251 | x 13 - 14d0e0da8e91 r11 [test] (draft) bm1 |
237 | o 12 - b568edbee6e0 r8 [debugbuilddag] (draft) |
252 | | |
|
253 +---o 12 - b568edbee6e0 r8 [debugbuilddag] (draft) |
|
254 | | |
|
255 | x 11 - 198b5c405d01 r5 [debugbuilddag] (draft) |
|
256 | | |
|
257 | x 4 - bebd167eb94d r4 [debugbuilddag] (draft) |
|
258 |/ |
238 |/ |
259 o 3 - 2dc09a01254d r3 [debugbuilddag] (draft) |
239 o 3 - 2dc09a01254d r3 [debugbuilddag] (draft) |
260 | |
240 | |
261 o 2 - 01241442b3c2 r2 [debugbuilddag] (draft) |
241 o 2 - 01241442b3c2 r2 [debugbuilddag] (draft) |
262 | |
242 | |