Mercurial > hg
annotate tests/test-qrecord.out @ 7138:0df098871e3d
test-permission: put sane permissions at the end of the test
If we don't do that, we won't delete all directories at the end of the test
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Sat, 18 Oct 2008 20:47:47 +0200 |
parents | 4a1ac535be1d |
children | f60730693efc |
rev | line source |
---|---|
5933 | 1 % help (no mq, so no qrecord) |
2 hg: unknown command 'qrecord' | |
3 Mercurial Distributed SCM | |
4 | |
5 basic commands: | |
6 | |
7 add add the specified files on the next commit | |
8 annotate show changeset information per file line | |
9 clone make a copy of an existing repository | |
10 commit commit the specified files or all outstanding changes | |
11 diff diff repository (or selected files) | |
12 export dump the header and diffs for one or more changesets | |
13 init create a new repository in the given directory | |
14 log show revision history of entire repository or files | |
15 merge merge working directory with another revision | |
16 parents show the parents of the working dir or revision | |
17 pull pull changes from the specified source | |
18 push push changes to the specified destination | |
19 remove remove the specified files on the next commit | |
20 serve export the repository via HTTP | |
21 status show changed files in the working directory | |
22 update update working directory | |
23 | |
7125
4a1ac535be1d
show enabled extensions in hg help
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6918
diff
changeset
|
24 enabled extensions: |
4a1ac535be1d
show enabled extensions in hg help
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6918
diff
changeset
|
25 |
4a1ac535be1d
show enabled extensions in hg help
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6918
diff
changeset
|
26 record interactive change selection during commit or qrefresh |
4a1ac535be1d
show enabled extensions in hg help
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6918
diff
changeset
|
27 |
5933 | 28 use "hg help" for the full list of commands or "hg -v" for details |
29 % help (mq present) | |
30 hg qrecord [OPTION]... PATCH [FILE]... | |
31 | |
32 interactively record a new patch | |
33 | |
34 see 'hg help qnew' & 'hg help record' for more information and usage | |
35 | |
36 options: | |
37 | |
38 -e --edit edit commit message | |
39 -g --git use git extended diff format | |
6918
c8555b127408
Adjust test output for hg help qrecord since ef14c773b3d6
Thomas Arendsen Hein <thomas@intevation.de>
parents:
5933
diff
changeset
|
40 -U --currentuser add "From: <current user>" to patch |
c8555b127408
Adjust test output for hg help qrecord since ef14c773b3d6
Thomas Arendsen Hein <thomas@intevation.de>
parents:
5933
diff
changeset
|
41 -u --user add "From: <given user>" to patch |
c8555b127408
Adjust test output for hg help qrecord since ef14c773b3d6
Thomas Arendsen Hein <thomas@intevation.de>
parents:
5933
diff
changeset
|
42 -D --currentdate add "Date: <current date>" to patch |
c8555b127408
Adjust test output for hg help qrecord since ef14c773b3d6
Thomas Arendsen Hein <thomas@intevation.de>
parents:
5933
diff
changeset
|
43 -d --date add "Date: <given date>" to patch |
5933 | 44 -I --include include names matching the given patterns |
45 -X --exclude exclude names matching the given patterns | |
46 -m --message use <text> as commit message | |
47 -l --logfile read commit message from <file> | |
48 | |
49 use "hg -v help qrecord" to show global options | |
50 % base commit | |
51 % changing files | |
52 % whole diff | |
53 diff -r 1057167b20ef 1.txt | |
54 --- a/1.txt | |
55 +++ b/1.txt | |
56 @@ -1,5 +1,5 @@ | |
57 1 | |
58 -2 | |
59 +2 2 | |
60 3 | |
61 -4 | |
62 +4 4 | |
63 5 | |
64 diff -r 1057167b20ef 2.txt | |
65 --- a/2.txt | |
66 +++ b/2.txt | |
67 @@ -1,5 +1,5 @@ | |
68 a | |
69 -b | |
70 +b b | |
71 c | |
72 d | |
73 e | |
74 diff -r 1057167b20ef dir/a.txt | |
75 --- a/dir/a.txt | |
76 +++ b/dir/a.txt | |
77 @@ -1,4 +1,4 @@ | |
78 -hello world | |
79 +hello world! | |
80 | |
81 someone | |
82 up | |
83 % qrecord a.patch | |
84 diff --git a/1.txt b/1.txt | |
85 2 hunks, 4 lines changed | |
86 examine changes to '1.txt'? [Ynsfdaq?] @@ -1,3 +1,3 @@ | |
87 1 | |
88 -2 | |
89 +2 2 | |
90 3 | |
91 record this change to '1.txt'? [Ynsfdaq?] @@ -3,3 +3,3 @@ | |
92 3 | |
93 -4 | |
94 +4 4 | |
95 5 | |
96 record this change to '1.txt'? [Ynsfdaq?] diff --git a/2.txt b/2.txt | |
97 1 hunks, 2 lines changed | |
98 examine changes to '2.txt'? [Ynsfdaq?] @@ -1,5 +1,5 @@ | |
99 a | |
100 -b | |
101 +b b | |
102 c | |
103 d | |
104 e | |
105 record this change to '2.txt'? [Ynsfdaq?] diff --git a/dir/a.txt b/dir/a.txt | |
106 1 hunks, 2 lines changed | |
107 examine changes to 'dir/a.txt'? [Ynsfdaq?] | |
108 % after qrecord a.patch 'tip' | |
109 changeset: 1:5d1ca63427ee | |
110 tag: qtip | |
111 tag: tip | |
112 tag: a.patch | |
113 tag: qbase | |
114 user: test | |
115 date: Thu Jan 01 00:00:00 1970 +0000 | |
116 summary: aaa | |
117 | |
118 diff -r 1057167b20ef -r 5d1ca63427ee 1.txt | |
119 --- a/1.txt Thu Jan 01 00:00:00 1970 +0000 | |
120 +++ b/1.txt Thu Jan 01 00:00:00 1970 +0000 | |
121 @@ -1,5 +1,5 @@ | |
122 1 | |
123 -2 | |
124 +2 2 | |
125 3 | |
126 4 | |
127 5 | |
128 diff -r 1057167b20ef -r 5d1ca63427ee 2.txt | |
129 --- a/2.txt Thu Jan 01 00:00:00 1970 +0000 | |
130 +++ b/2.txt Thu Jan 01 00:00:00 1970 +0000 | |
131 @@ -1,5 +1,5 @@ | |
132 a | |
133 -b | |
134 +b b | |
135 c | |
136 d | |
137 e | |
138 | |
139 | |
140 % after qrecord a.patch 'diff' | |
141 diff -r 5d1ca63427ee 1.txt | |
142 --- a/1.txt | |
143 +++ b/1.txt | |
144 @@ -1,5 +1,5 @@ | |
145 1 | |
146 2 2 | |
147 3 | |
148 -4 | |
149 +4 4 | |
150 5 | |
151 diff -r 5d1ca63427ee dir/a.txt | |
152 --- a/dir/a.txt | |
153 +++ b/dir/a.txt | |
154 @@ -1,4 +1,4 @@ | |
155 -hello world | |
156 +hello world! | |
157 | |
158 someone | |
159 up | |
160 % qrecord b.patch | |
161 diff --git a/1.txt b/1.txt | |
162 1 hunks, 2 lines changed | |
163 examine changes to '1.txt'? [Ynsfdaq?] @@ -1,5 +1,5 @@ | |
164 1 | |
165 2 2 | |
166 3 | |
167 -4 | |
168 +4 4 | |
169 5 | |
170 record this change to '1.txt'? [Ynsfdaq?] diff --git a/dir/a.txt b/dir/a.txt | |
171 1 hunks, 2 lines changed | |
172 examine changes to 'dir/a.txt'? [Ynsfdaq?] @@ -1,4 +1,4 @@ | |
173 -hello world | |
174 +hello world! | |
175 | |
176 someone | |
177 up | |
178 record this change to 'dir/a.txt'? [Ynsfdaq?] | |
179 % after qrecord b.patch 'tip' | |
180 changeset: 2:b056198bf878 | |
181 tag: qtip | |
182 tag: tip | |
183 tag: b.patch | |
184 user: test | |
185 date: Thu Jan 01 00:00:00 1970 +0000 | |
186 summary: bbb | |
187 | |
188 diff -r 5d1ca63427ee -r b056198bf878 1.txt | |
189 --- a/1.txt Thu Jan 01 00:00:00 1970 +0000 | |
190 +++ b/1.txt Thu Jan 01 00:00:00 1970 +0000 | |
191 @@ -1,5 +1,5 @@ | |
192 1 | |
193 2 2 | |
194 3 | |
195 -4 | |
196 +4 4 | |
197 5 | |
198 diff -r 5d1ca63427ee -r b056198bf878 dir/a.txt | |
199 --- a/dir/a.txt Thu Jan 01 00:00:00 1970 +0000 | |
200 +++ b/dir/a.txt Thu Jan 01 00:00:00 1970 +0000 | |
201 @@ -1,4 +1,4 @@ | |
202 -hello world | |
203 +hello world! | |
204 | |
205 someone | |
206 up | |
207 | |
208 | |
209 % after qrecord b.patch 'diff' | |
210 | |
211 % --- end --- |