equal
deleted
inserted
replaced
47 checkundo 'qpush -m' |
47 checkundo 'qpush -m' |
48 hg manifest |
48 hg manifest |
49 |
49 |
50 # ensure status is correct after merge |
50 # ensure status is correct after merge |
51 hg qpop -a |
51 hg qpop -a |
|
52 cd .. |
|
53 |
|
54 # Classic MQ merge sequence *with an explicit named queue* |
|
55 echo |
|
56 echo % init t2 |
|
57 hg init t2 |
|
58 cd t2 |
|
59 echo a > a |
|
60 hg ci -Am init |
|
61 echo b >> a |
|
62 hg ci -m changea |
|
63 hg up -C 0 |
|
64 echo c >> a |
|
65 hg qnew -f -e patcha |
|
66 echo % create the reference queue |
|
67 hg qsave -c -e -n refqueue 2> /dev/null |
|
68 hg up -C 1 |
|
69 echo % merge |
|
70 hg qpush -m -n refqueue 2>&1 | \ |
|
71 sed 's/merging with queue at.*refqueue/merging with queue at refqueue/' |
|
72 cd .. |
|
73 |