Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-mq-qrefresh @ 5390:36c46e20976a
merge: provide *_ISLINK environment vars to merge helper
Sets HG_MY_ISLINK, HG_OTHER_ISLINK, HG_BASE_ISLINK in environment. Without these variables, it's impossible for the merge application to know whether the 'other' and 'base' files were symlinks in their original contexts. For the purposes of the merge they are always emitted as small text files.
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Wed, 03 Oct 2007 23:09:36 +0200 |
parents | f01efb4bc258 |
children |
rev | line source |
---|---|
3129
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
1 #!/bin/sh |
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
2 |
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
3 echo "[extensions]" >> $HGRCPATH |
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
4 echo "mq=" >> $HGRCPATH |
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
5 |
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
6 echo % init |
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
7 hg init a |
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
8 cd a |
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
9 |
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
10 echo % commit |
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
11 mkdir 1 2 |
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
12 echo 'base' > 1/base |
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
13 echo 'base' > 2/base |
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
14 hg ci -Ambase -d '1 0' |
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
15 |
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
16 echo % qnew mqbase |
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
17 hg qnew -mmqbase mqbase |
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
18 |
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
19 echo % qrefresh |
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
20 echo 'patched' > 1/base |
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
21 echo 'patched' > 2/base |
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
22 hg qrefresh |
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
23 |
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
24 echo % qdiff |
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
25 hg qdiff | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ |
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
26 -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" |
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
27 |
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
28 echo % qdiff dirname |
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
29 hg qdiff . | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ |
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
30 -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" |
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
31 |
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
32 echo % patch file contents |
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
33 cat .hg/patches/mqbase | \ |
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
34 sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ |
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
35 -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" |
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
36 |
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
37 echo % qrefresh 1 |
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
38 echo 'patched again' > base |
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
39 hg qrefresh 1 |
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
40 |
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
41 echo % qdiff |
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
42 hg qdiff | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ |
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
43 -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" |
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
44 |
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
45 echo % qdiff dirname |
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
46 hg qdiff . | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ |
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
47 -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" |
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
48 |
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
49 echo % patch file contents |
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
50 cat .hg/patches/mqbase | \ |
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
51 sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ |
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
52 -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" |
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
53 |
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
54 echo % qrefresh . in subdir |
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
55 ( cd 1 ; hg qrefresh . ) |
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
56 |
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
57 echo % qdiff |
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
58 hg qdiff | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ |
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
59 -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" |
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
60 |
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
61 echo % qdiff dirname |
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
62 hg qdiff . | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ |
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
63 -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" |
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
64 |
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
65 echo % patch file contents |
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
66 cat .hg/patches/mqbase | \ |
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
67 sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ |
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
68 -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" |
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
69 |
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
70 echo % qrefresh in hg-root again |
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
71 hg qrefresh |
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
72 |
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
73 echo % qdiff |
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
74 hg qdiff | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ |
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
75 -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" |
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
76 |
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
77 echo % qdiff dirname |
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
78 hg qdiff . | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ |
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
79 -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" |
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
80 |
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
81 echo % patch file contents |
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
82 cat .hg/patches/mqbase | \ |
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
83 sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ |
f01efb4bc258
tests: add new test; test-mq-qrefresh
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
84 -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" |