Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-mq-qrefresh @ 3137:2c472ab42b08
Merge with crew
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Thu, 21 Sep 2006 16:15:39 -0500 |
parents | f01efb4bc258 |
children |
comparison
equal
deleted
inserted
replaced
3136:b1db258e875c | 3137:2c472ab42b08 |
---|---|
1 #!/bin/sh | |
2 | |
3 echo "[extensions]" >> $HGRCPATH | |
4 echo "mq=" >> $HGRCPATH | |
5 | |
6 echo % init | |
7 hg init a | |
8 cd a | |
9 | |
10 echo % commit | |
11 mkdir 1 2 | |
12 echo 'base' > 1/base | |
13 echo 'base' > 2/base | |
14 hg ci -Ambase -d '1 0' | |
15 | |
16 echo % qnew mqbase | |
17 hg qnew -mmqbase mqbase | |
18 | |
19 echo % qrefresh | |
20 echo 'patched' > 1/base | |
21 echo 'patched' > 2/base | |
22 hg qrefresh | |
23 | |
24 echo % qdiff | |
25 hg qdiff | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ | |
26 -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" | |
27 | |
28 echo % qdiff dirname | |
29 hg qdiff . | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ | |
30 -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" | |
31 | |
32 echo % patch file contents | |
33 cat .hg/patches/mqbase | \ | |
34 sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ | |
35 -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" | |
36 | |
37 echo % qrefresh 1 | |
38 echo 'patched again' > base | |
39 hg qrefresh 1 | |
40 | |
41 echo % qdiff | |
42 hg qdiff | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ | |
43 -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" | |
44 | |
45 echo % qdiff dirname | |
46 hg qdiff . | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ | |
47 -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" | |
48 | |
49 echo % patch file contents | |
50 cat .hg/patches/mqbase | \ | |
51 sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ | |
52 -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" | |
53 | |
54 echo % qrefresh . in subdir | |
55 ( cd 1 ; hg qrefresh . ) | |
56 | |
57 echo % qdiff | |
58 hg qdiff | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ | |
59 -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" | |
60 | |
61 echo % qdiff dirname | |
62 hg qdiff . | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ | |
63 -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" | |
64 | |
65 echo % patch file contents | |
66 cat .hg/patches/mqbase | \ | |
67 sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ | |
68 -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" | |
69 | |
70 echo % qrefresh in hg-root again | |
71 hg qrefresh | |
72 | |
73 echo % qdiff | |
74 hg qdiff | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ | |
75 -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" | |
76 | |
77 echo % qdiff dirname | |
78 hg qdiff . | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ | |
79 -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" | |
80 | |
81 echo % patch file contents | |
82 cat .hg/patches/mqbase | \ | |
83 sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ | |
84 -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" |