|
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
|
|
|
24 use "hg help" for the full list of commands or "hg -v" for details
|
|
|
25 % help (mq present)
|
|
|
26 hg qrecord [OPTION]... PATCH [FILE]...
|
|
|
27
|
|
|
28 interactively record a new patch
|
|
|
29
|
|
|
30 see 'hg help qnew' & 'hg help record' for more information and usage
|
|
|
31
|
|
|
32 options:
|
|
|
33
|
|
|
34 -e --edit edit commit message
|
|
|
35 -g --git use git extended diff format
|
|
|
36 -I --include include names matching the given patterns
|
|
|
37 -X --exclude exclude names matching the given patterns
|
|
|
38 -m --message use <text> as commit message
|
|
|
39 -l --logfile read commit message from <file>
|
|
|
40 -U --currentuser add "From: <current user>" to patch
|
|
|
41 -u --user add "From: <given user>" to patch
|
|
|
42 -D --currentdate add "Date: <current date>" to patch
|
|
|
43 -d --date add "Date: <given date>" to patch
|
|
|
44
|
|
|
45 use "hg -v help qrecord" to show global options
|
|
|
46 % base commit
|
|
|
47 % changing files
|
|
|
48 % whole diff
|
|
|
49 diff -r 1057167b20ef 1.txt
|
|
|
50 --- a/1.txt
|
|
|
51 +++ b/1.txt
|
|
|
52 @@ -1,5 +1,5 @@
|
|
|
53 1
|
|
|
54 -2
|
|
|
55 +2 2
|
|
|
56 3
|
|
|
57 -4
|
|
|
58 +4 4
|
|
|
59 5
|
|
|
60 diff -r 1057167b20ef 2.txt
|
|
|
61 --- a/2.txt
|
|
|
62 +++ b/2.txt
|
|
|
63 @@ -1,5 +1,5 @@
|
|
|
64 a
|
|
|
65 -b
|
|
|
66 +b b
|
|
|
67 c
|
|
|
68 d
|
|
|
69 e
|
|
|
70 diff -r 1057167b20ef dir/a.txt
|
|
|
71 --- a/dir/a.txt
|
|
|
72 +++ b/dir/a.txt
|
|
|
73 @@ -1,4 +1,4 @@
|
|
|
74 -hello world
|
|
|
75 +hello world!
|
|
|
76
|
|
|
77 someone
|
|
|
78 up
|
|
|
79 % qrecord a.patch
|
|
|
80 diff --git a/1.txt b/1.txt
|
|
|
81 2 hunks, 4 lines changed
|
|
|
82 examine changes to '1.txt'? [Ynsfdaq?] @@ -1,3 +1,3 @@
|
|
|
83 1
|
|
|
84 -2
|
|
|
85 +2 2
|
|
|
86 3
|
|
|
87 record this change to '1.txt'? [Ynsfdaq?] @@ -3,3 +3,3 @@
|
|
|
88 3
|
|
|
89 -4
|
|
|
90 +4 4
|
|
|
91 5
|
|
|
92 record this change to '1.txt'? [Ynsfdaq?] diff --git a/2.txt b/2.txt
|
|
|
93 1 hunks, 2 lines changed
|
|
|
94 examine changes to '2.txt'? [Ynsfdaq?] @@ -1,5 +1,5 @@
|
|
|
95 a
|
|
|
96 -b
|
|
|
97 +b b
|
|
|
98 c
|
|
|
99 d
|
|
|
100 e
|
|
|
101 record this change to '2.txt'? [Ynsfdaq?] diff --git a/dir/a.txt b/dir/a.txt
|
|
|
102 1 hunks, 2 lines changed
|
|
|
103 examine changes to 'dir/a.txt'? [Ynsfdaq?]
|
|
|
104 % after qrecord a.patch 'tip'
|
|
|
105 changeset: 1:5d1ca63427ee
|
|
|
106 tag: qtip
|
|
|
107 tag: tip
|
|
|
108 tag: a.patch
|
|
|
109 tag: qbase
|
|
|
110 user: test
|
|
|
111 date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
112 summary: aaa
|
|
|
113
|
|
|
114 diff -r 1057167b20ef -r 5d1ca63427ee 1.txt
|
|
|
115 --- a/1.txt Thu Jan 01 00:00:00 1970 +0000
|
|
|
116 +++ b/1.txt Thu Jan 01 00:00:00 1970 +0000
|
|
|
117 @@ -1,5 +1,5 @@
|
|
|
118 1
|
|
|
119 -2
|
|
|
120 +2 2
|
|
|
121 3
|
|
|
122 4
|
|
|
123 5
|
|
|
124 diff -r 1057167b20ef -r 5d1ca63427ee 2.txt
|
|
|
125 --- a/2.txt Thu Jan 01 00:00:00 1970 +0000
|
|
|
126 +++ b/2.txt Thu Jan 01 00:00:00 1970 +0000
|
|
|
127 @@ -1,5 +1,5 @@
|
|
|
128 a
|
|
|
129 -b
|
|
|
130 +b b
|
|
|
131 c
|
|
|
132 d
|
|
|
133 e
|
|
|
134
|
|
|
135
|
|
|
136 % after qrecord a.patch 'diff'
|
|
|
137 diff -r 5d1ca63427ee 1.txt
|
|
|
138 --- a/1.txt
|
|
|
139 +++ b/1.txt
|
|
|
140 @@ -1,5 +1,5 @@
|
|
|
141 1
|
|
|
142 2 2
|
|
|
143 3
|
|
|
144 -4
|
|
|
145 +4 4
|
|
|
146 5
|
|
|
147 diff -r 5d1ca63427ee dir/a.txt
|
|
|
148 --- a/dir/a.txt
|
|
|
149 +++ b/dir/a.txt
|
|
|
150 @@ -1,4 +1,4 @@
|
|
|
151 -hello world
|
|
|
152 +hello world!
|
|
|
153
|
|
|
154 someone
|
|
|
155 up
|
|
|
156 % qrecord b.patch
|
|
|
157 diff --git a/1.txt b/1.txt
|
|
|
158 1 hunks, 2 lines changed
|
|
|
159 examine changes to '1.txt'? [Ynsfdaq?] @@ -1,5 +1,5 @@
|
|
|
160 1
|
|
|
161 2 2
|
|
|
162 3
|
|
|
163 -4
|
|
|
164 +4 4
|
|
|
165 5
|
|
|
166 record this change to '1.txt'? [Ynsfdaq?] diff --git a/dir/a.txt b/dir/a.txt
|
|
|
167 1 hunks, 2 lines changed
|
|
|
168 examine changes to 'dir/a.txt'? [Ynsfdaq?] @@ -1,4 +1,4 @@
|
|
|
169 -hello world
|
|
|
170 +hello world!
|
|
|
171
|
|
|
172 someone
|
|
|
173 up
|
|
|
174 record this change to 'dir/a.txt'? [Ynsfdaq?]
|
|
|
175 % after qrecord b.patch 'tip'
|
|
|
176 changeset: 2:b056198bf878
|
|
|
177 tag: qtip
|
|
|
178 tag: tip
|
|
|
179 tag: b.patch
|
|
|
180 user: test
|
|
|
181 date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
182 summary: bbb
|
|
|
183
|
|
|
184 diff -r 5d1ca63427ee -r b056198bf878 1.txt
|
|
|
185 --- a/1.txt Thu Jan 01 00:00:00 1970 +0000
|
|
|
186 +++ b/1.txt Thu Jan 01 00:00:00 1970 +0000
|
|
|
187 @@ -1,5 +1,5 @@
|
|
|
188 1
|
|
|
189 2 2
|
|
|
190 3
|
|
|
191 -4
|
|
|
192 +4 4
|
|
|
193 5
|
|
|
194 diff -r 5d1ca63427ee -r b056198bf878 dir/a.txt
|
|
|
195 --- a/dir/a.txt Thu Jan 01 00:00:00 1970 +0000
|
|
|
196 +++ b/dir/a.txt Thu Jan 01 00:00:00 1970 +0000
|
|
|
197 @@ -1,4 +1,4 @@
|
|
|
198 -hello world
|
|
|
199 +hello world!
|
|
|
200
|
|
|
201 someone
|
|
|
202 up
|
|
|
203
|
|
|
204
|
|
|
205 % after qrecord b.patch 'diff'
|
|
|
206
|
|
|
207 % --- end ---
|
