comparison tests/test-mq.t @ 16329:b3fefbb95aad

merge with stable
author Matt Mackall <mpm@selenic.com>
date Sat, 31 Mar 2012 14:05:10 -0500
parents 73f4e05287b4 7c76587fb372
children 41b41adba08a
comparison
equal deleted inserted replaced
16328:d388c3fc8319 16329:b3fefbb95aad
517 abort: please specify the patch to move 517 abort: please specify the patch to move
518 [255] 518 [255]
519 $ hg qpush --move test.patch # already applied 519 $ hg qpush --move test.patch # already applied
520 abort: cannot push to a previous patch: test.patch 520 abort: cannot push to a previous patch: test.patch
521 [255] 521 [255]
522 $ sed -i.bak '2i# make qtip index different in series and fullseries' `hg root`/.hg/patches/series 522 $ sed -i.bak '2i\# make qtip index different in series and fullseries' `hg root`/.hg/patches/series
523 $ cat `hg root`/.hg/patches/series 523 $ cat `hg root`/.hg/patches/series
524 # comment 524 # comment
525 # make qtip index different in series and fullseries 525 # make qtip index different in series and fullseries
526 526
527 test.patch 527 test.patch