Mercurial > hg
comparison tests/test-mq @ 2886:bee4b7abcb01
Merge with crew
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 14 Aug 2006 14:42:15 -0500 |
parents | 307439d6fede |
children | 2f190e998eb3 |
comparison
equal
deleted
inserted
replaced
2842:06c05c675a35 | 2886:bee4b7abcb01 |
---|---|
8 hg help mq | 8 hg help mq |
9 | 9 |
10 hg init a | 10 hg init a |
11 cd a | 11 cd a |
12 echo a > a | 12 echo a > a |
13 hg ci -Ama | |
14 | |
15 hg clone . ../k | |
16 | |
13 mkdir b | 17 mkdir b |
14 echo z > b/z | 18 echo z > b/z |
15 hg ci -Ama | 19 hg ci -Ama |
16 | 20 |
17 echo % qinit | 21 echo % qinit |
46 | 50 |
47 echo % qrefresh | 51 echo % qrefresh |
48 | 52 |
49 echo a >> a | 53 echo a >> a |
50 hg qrefresh | 54 hg qrefresh |
51 sed -e "s/\(^diff -r \)\([a-f0-9]* \)/\1 x/" \ | 55 sed -e "s/^\(diff -r \)\([a-f0-9]* \)/\1 x/" \ |
52 -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ | 56 -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ |
53 -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" .hg/patches/test.patch | 57 -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" .hg/patches/test.patch |
54 | 58 |
55 echo % qpop | 59 echo % qpop |
56 | 60 |
101 hg qpop | 105 hg qpop |
102 hg qnext | 106 hg qnext |
103 hg qprev | 107 hg qprev |
104 hg qapplied | 108 hg qapplied |
105 | 109 |
110 echo % commit should fail | |
111 hg commit | |
112 | |
113 echo % push should fail | |
114 hg push ../../k | |
115 | |
106 echo % qunapplied | 116 echo % qunapplied |
107 hg qunapplied | 117 hg qunapplied |
118 | |
119 echo % push should succeed | |
120 hg qpop -a | |
121 hg push ../../k | |
108 | 122 |
109 echo % strip | 123 echo % strip |
110 cd ../../b | 124 cd ../../b |
111 echo x>x | 125 echo x>x |
112 hg ci -Ama | 126 hg ci -Ama |