##// END OF EJS Templates
test-mq-merge: quote ^...
Mads Kiilerich -
r11071:2376b4cc stable
parent child Browse files
Show More
@@ -28,7 +28,7 b' 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
@@ -40,7 +40,7 b' hg ci -m update'
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
General Comments 0
You need to be logged in to leave comments. Login now