Show More
@@ -220,6 +220,8 b' class kwtemplater(object):' | |||||
220 | self.repo.wwrite(f, data, mf.flags(f)) |
|
220 | self.repo.wwrite(f, data, mf.flags(f)) | |
221 | if node is None: |
|
221 | if node is None: | |
222 | self.repo.dirstate.normal(f) |
|
222 | self.repo.dirstate.normal(f) | |
|
223 | elif self.record: | |||
|
224 | self.repo.dirstate.normallookup(f) | |||
223 | self.restrict = False |
|
225 | self.restrict = False | |
224 |
|
226 | |||
225 | def shrinktext(self, text): |
|
227 | def shrinktext(self, text): |
@@ -142,7 +142,7 b' hg -v kwexpand' | |||||
142 | echo % compare changenodes in a c |
|
142 | echo % compare changenodes in a c | |
143 | cat a c |
|
143 | cat a c | |
144 |
|
144 | |||
145 | echo % record |
|
145 | echo % record chunk | |
146 | python -c \ |
|
146 | python -c \ | |
147 | 'l=open("a").readlines();l.insert(1,"foo\n");l.append("bar\n");open("a","w").writelines(l);' |
|
147 | 'l=open("a").readlines();l.insert(1,"foo\n");l.append("bar\n");open("a","w").writelines(l);' | |
148 | hg record -d '1 10' -m rectest<<EOF |
|
148 | hg record -d '1 10' -m rectest<<EOF | |
@@ -157,6 +157,19 b' echo % cat modified file' | |||||
157 | cat a |
|
157 | cat a | |
158 | hg diff | grep -v 'b/a' |
|
158 | hg diff | grep -v 'b/a' | |
159 | hg rollback |
|
159 | hg rollback | |
|
160 | ||||
|
161 | echo % record file | |||
|
162 | echo foo > msg | |||
|
163 | # do not use "hg record -m" here! | |||
|
164 | hg record -l msg -d '1 11'<<EOF | |||
|
165 | y | |||
|
166 | y | |||
|
167 | y | |||
|
168 | EOF | |||
|
169 | echo % a should be clean | |||
|
170 | hg status -A a | |||
|
171 | rm msg | |||
|
172 | hg rollback | |||
160 | hg update -C |
|
173 | hg update -C | |
161 |
|
174 | |||
162 | echo % init --mq |
|
175 | echo % init --mq |
@@ -132,7 +132,7 b' do not process $Id:' | |||||
132 | xxx $ |
|
132 | xxx $ | |
133 | $Id: c,v 40a904bbbe4c 1970/01/01 00:00:01 user $ |
|
133 | $Id: c,v 40a904bbbe4c 1970/01/01 00:00:01 user $ | |
134 | tests for different changenodes |
|
134 | tests for different changenodes | |
135 | % record |
|
135 | % record chunk | |
136 | diff --git a/a b/a |
|
136 | diff --git a/a b/a | |
137 | 2 hunks, 2 lines changed |
|
137 | 2 hunks, 2 lines changed | |
138 | examine changes to 'a'? [Ynsfdaq?] |
|
138 | examine changes to 'a'? [Ynsfdaq?] | |
@@ -164,6 +164,24 b' diff -r d17e03c92c97 a' | |||||
164 | xxx $ |
|
164 | xxx $ | |
165 | +bar |
|
165 | +bar | |
166 | rolling back to revision 2 (undo commit) |
|
166 | rolling back to revision 2 (undo commit) | |
|
167 | % record file | |||
|
168 | diff --git a/a b/a | |||
|
169 | 2 hunks, 2 lines changed | |||
|
170 | examine changes to 'a'? [Ynsfdaq?] | |||
|
171 | @@ -1,3 +1,4 @@ | |||
|
172 | expand $Id$ | |||
|
173 | +foo | |||
|
174 | do not process $Id: | |||
|
175 | xxx $ | |||
|
176 | record change 1/2 to 'a'? [Ynsfdaq?] | |||
|
177 | @@ -2,2 +3,3 @@ | |||
|
178 | do not process $Id: | |||
|
179 | xxx $ | |||
|
180 | +bar | |||
|
181 | record change 2/2 to 'a'? [Ynsfdaq?] | |||
|
182 | % a should be clean | |||
|
183 | C a | |||
|
184 | rolling back to revision 2 (undo commit) | |||
167 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
185 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
168 | % init --mq |
|
186 | % init --mq | |
169 | % qimport |
|
187 | % qimport |
General Comments 0
You need to be logged in to leave comments.
Login now