comparison tests/test-topic-change.t @ 3167:f089741039e5 mercurial-4.2

test-compat: merge mercurial-4.3 into mercurial-4.2
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Wed, 01 Nov 2017 23:58:27 +0100
parents 9c9c8c1eeb93
children 50be10c63825 1e2f683e11e7
comparison
equal deleted inserted replaced
3166:e1a230cc4527 3167:f089741039e5
300 active topic 'watwat' is now empty 300 active topic 'watwat' is now empty
301 changed topic on 1 changes 301 changed topic on 1 changes
302 302
303 $ hg glog 303 $ hg glog
304 @ 34:c48d6d71b2d9 {} 304 @ 34:c48d6d71b2d9 {}
305 | Added h (book) 305 | Added h ()
306 |
307 | x 33:a24c31c35013 {watwat}
308 |/ Added h (book)
306 | 309 |
307 o 26:7c76c271395f {bar} 310 o 26:7c76c271395f {bar}
308 | Added g () 311 | Added g ()
309 | 312 |
310 o 25:7f26084dfaf1 {bar} 313 o 25:7f26084dfaf1 {bar}
332 $ hg topic -r . movebook 335 $ hg topic -r . movebook
333 switching to topic movebook 336 switching to topic movebook
334 changed topic on 1 changes 337 changed topic on 1 changes
335 $ hg glog 338 $ hg glog
336 @ 35:1b83d11095b9 {movebook} 339 @ 35:1b83d11095b9 {movebook}
337 | Added h (book bookboo) 340 | Added h ()
341 |
342 | x 34:c48d6d71b2d9 {}
343 |/ Added h (bookboo)
344 |
345 | x 33:a24c31c35013 {watwat}
346 |/ Added h (book)
338 | 347 |
339 o 26:7c76c271395f {bar} 348 o 26:7c76c271395f {bar}
340 | Added g () 349 | Added g ()
341 | 350 |
342 o 25:7f26084dfaf1 {bar} 351 o 25:7f26084dfaf1 {bar}
376 $ hg glog 385 $ hg glog
377 @ 36:894983f69e69 {watwat} 386 @ 36:894983f69e69 {watwat}
378 | Added g () 387 | Added g ()
379 | 388 |
380 | o 35:1b83d11095b9 {movebook} 389 | o 35:1b83d11095b9 {movebook}
381 | | Added h (book bookboo) 390 | | Added h ()
391 | |
392 | | x 34:c48d6d71b2d9 {}
393 | |/ Added h (bookboo)
394 | |
395 | | x 33:a24c31c35013 {watwat}
396 | |/ Added h (book)
382 | | 397 | |
383 | x 26:7c76c271395f {bar} 398 | x 26:7c76c271395f {bar}
384 |/ Added g () 399 |/ Added g ()
385 | 400 |
386 o 25:7f26084dfaf1 {bar} 401 o 25:7f26084dfaf1 {bar}