equal
deleted
inserted
replaced
26 hg qnew rm_a |
26 hg qnew rm_a |
27 hg rm a |
27 hg rm a |
28 hg qrefresh -m "rm a" |
28 hg qrefresh -m "rm a" |
29 |
29 |
30 # Save the patch queue so we can merge it later |
30 # Save the patch queue so we can merge it later |
31 hg qsave -c -e 2>&1 | grep -v ^copy |
31 hg qsave -c -e 2>&1 | grep -v '^copy' |
32 checkundo qsave |
32 checkundo qsave |
33 |
33 |
34 # Update b and commit in an "update" changeset |
34 # Update b and commit in an "update" changeset |
35 hg up -C init |
35 hg up -C init |
36 echo b >> b |
36 echo b >> b |
38 hg ci -m update |
38 hg ci -m update |
39 |
39 |
40 # Here, qpush used to abort with : |
40 # Here, qpush used to abort with : |
41 # The system cannot find the file specified => a |
41 # The system cannot find the file specified => a |
42 hg manifest |
42 hg manifest |
43 hg qpush -a -m 2>&1 | grep -v ^merging |
43 hg qpush -a -m 2>&1 | grep -v '^merging' |
44 checkundo 'qpush -m' |
44 checkundo 'qpush -m' |
45 hg manifest |
45 hg manifest |
46 |
46 |
47 # ensure status is correct after merge |
47 # ensure status is correct after merge |
48 hg qpop -a |
48 hg qpop -a |