comparison tests/test-evolve-topic.t @ 3375:1cb549cd6236

branching: merge with stable
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Fri, 05 Jan 2018 23:20:30 +0100
parents ae6fddf39933 92b414710d2e
children 77284eefbd4d e1f3e43a50a4
comparison
equal deleted inserted replaced
3374:612b3bd31499 3375:1cb549cd6236
222 [1] 222 [1]
223 $ hg prev --no-topic 223 $ hg prev --no-topic
224 switching to topic foo 224 switching to topic foo
225 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 225 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
226 [12] add eee 226 [12] add eee
227
228 Testing when instability is involved
229
230 $ hg log -G
231 o 17 - {bar} 9bf430c106b7 add jjj (draft)
232 |
233 o 16 - {bar} d2dc89c57700 add iii (draft)
234 |
235 o 15 - {bar} 20bc4d02aa62 add hhh (draft)
236 |
237 o 14 - {bar} 16d6f664b17c add ggg (draft)
238 |
239 o 13 - {foo} 070c5573d8f9 add fff (draft)
240 |
241 @ 12 - {foo} 42b49017ff90 add eee (draft)
242 |
243 o 10 - {foo} d9cacd156ffc add ddd (draft)
244 |
245 o 2 - {foo} cced9bac76e3 add ccc (draft)
246 |
247 o 1 - {} a4dbed0837ea add bbb (draft)
248 |
249 o 0 - {} 199cc73e9a0b add aaa (draft)
250
251 $ hg topic -r 13 bar
252 changed topic on 1 changes
253 $ hg up 14
254 switching to topic bar
255 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
256
257 $ hg stack
258 ### topic: bar
259 ### target: default (branch)
260 t5$ add jjj (unstable)
261 t4$ add iii (unstable)
262 t3$ add hhh (unstable)
263 t2$ add ggg (current unstable)
264 t1: add fff
265 t0^ add eee (base)
266
267 $ hg prev
268 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
269 [18] add fff