Mercurial > hg-stable

comparison tests/test-mq-qfold.t @ 12324:b701610f6c56

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: unify some of test-mq*
author Adrian Buehlmann <adrian@cadifra.com>
date Sun, 19 Sep 2010 23:42:18 +0200
parents tests/test-mq-qfold@8cb81d75730c
children 02990e22150b
comparison
equal deleted inserted replaced
12318:d643ae555a4d 12324:b701610f6c56
1 $ echo "[extensions]" >> $HGRCPATH
2 $ echo "mq=" >> $HGRCPATH
3 $ echo "[mq]" >> $HGRCPATH
4 $ echo "git=keep" >> $HGRCPATH
5 $ echo "[diff]" >> $HGRCPATH
6 $ echo "nodates=1" >> $HGRCPATH
7
8 init:
9
10 $ hg init repo
11 $ cd repo
12 $ echo a > a
13 $ hg ci -Am adda
14 adding a
15 $ echo a >> a
16 $ hg qnew -f p1
17 $ echo b >> a
18 $ hg qnew -f p2
19 $ echo c >> a
20 $ hg qnew -f p3
21
22 Fold in the middle of the queue:
23
24 $ hg qpop p1
25 popping p3
26 popping p2
27 now at: p1
28
29 $ hg qdiff
30 diff -r 07f494440405 a
31 --- a/a
32 +++ b/a
33 @@ -1,1 +1,2 @@
34 a
35 +a
36
37 $ hg qfold p2
38 $ grep git .hg/patches/p1 && echo 'git patch found!'
39 [1]
40
41 $ hg qser
42 p1
43 p3
44
45 $ hg qdiff
46 diff -r 07f494440405 a
47 --- a/a
48 +++ b/a
49 @@ -1,1 +1,3 @@
50 a
51 +a
52 +b
53
54 Fold with local changes:
55
56 $ echo d >> a
57 $ hg qfold p3
58 abort: local changes found, refresh first
59 [255]
60
61 $ hg diff -c .
62 diff -r 07f494440405 -r ............ a
63 --- a/a
64 +++ b/a
65 @@ -1,1 +1,3 @@
66 a
67 +a
68 +b
69
70 $ hg revert -a --no-backup
71 reverting a
72
73 Fold git patch into a regular patch, expect git patch:
74
75 $ echo a >> a
76 $ hg qnew -f regular
77 $ hg cp a aa
78 $ hg qnew --git -f git
79
80 $ hg qpop
81 popping git
82 now at: regular
83
84 $ hg qfold git
85
86 $ cat .hg/patches/regular
87 # HG changeset patch
88 # Parent ........................................
89
90 diff --git a/a b/a
91 --- a/a
92 +++ b/a
93 @@ -1,3 +1,4 @@
94 a
95 a
96 b
97 +a
98 diff --git a/a b/aa
99 copy from a
100 copy to aa
101 --- a/a
102 +++ b/aa
103 @@ -1,3 +1,4 @@
104 a
105 a
106 b
107 +a
108
109 $ hg qpop
110 popping regular
111 now at: p1
112
113 $ hg qdel regular
114
115 Fold regular patch into a git patch, expect git patch:
116
117 $ hg cp a aa
118 $ hg qnew --git -f git
119 $ echo b >> aa
120 $ hg qnew -f regular
121
122 $ hg qpop
123 popping regular
124 now at: git
125
126 $ hg qfold regular
127
128 $ cat .hg/patches/git
129 # HG changeset patch
130 # Parent ........................................
131
132 diff --git a/a b/aa
133 copy from a
134 copy to aa
135 --- a/a
136 +++ b/aa
137 @@ -1,3 +1,4 @@
138 a
139 a
140 b
141 +b
142
143 $ cd ..
144