Show More
@@ -285,6 +285,16 b' def reposetup(ui, repo):' | |||
|
285 | 285 | printmessage=False) |
|
286 | 286 | result = orig(text=text, user=user, date=date, match=match, |
|
287 | 287 | force=force, editor=editor, extra=extra) |
|
288 | ||
|
289 | if result: | |
|
290 | lfdirstate = lfutil.openlfdirstate(ui, self) | |
|
291 | for f in self[result].files(): | |
|
292 | if lfutil.isstandin(f): | |
|
293 | lfile = lfutil.splitstandin(f) | |
|
294 | lfutil.synclfdirstate(self, lfdirstate, lfile, | |
|
295 | False) | |
|
296 | lfdirstate.write() | |
|
297 | ||
|
288 | 298 | return result |
|
289 | 299 | # Case 1: user calls commit with no specific files or |
|
290 | 300 | # include/exclude patterns: refresh and commit all files that |
@@ -129,4 +129,42 b' Test that "hg rollback" restores status ' | |||
|
129 | 129 | $ hg status -A largeY |
|
130 | 130 | ? largeY |
|
131 | 131 | |
|
132 | Test that "hg status" shows status of largefiles correctly just after | |
|
133 | automated commit like rebase/transplant | |
|
134 | ||
|
135 | $ cat >> .hg/hgrc <<EOF | |
|
136 | > [extensions] | |
|
137 | > rebase = | |
|
138 | > strip = | |
|
139 | > transplant = | |
|
140 | > EOF | |
|
141 | $ hg update -q -C 1 | |
|
142 | $ hg remove large1 | |
|
143 | $ echo largeX > largeX | |
|
144 | $ hg add --large largeX | |
|
145 | $ hg commit -m '#4' | |
|
146 | ||
|
147 | $ hg rebase -s 1 -d 2 --keep | |
|
148 | $ hg status -A large1 | |
|
149 | large1: No such file or directory | |
|
150 | $ hg status -A largeX | |
|
151 | C largeX | |
|
152 | $ hg strip -q 5 | |
|
153 | ||
|
154 | $ hg update -q -C 2 | |
|
155 | $ hg transplant -q 1 4 | |
|
156 | $ hg status -A large1 | |
|
157 | large1: No such file or directory | |
|
158 | $ hg status -A largeX | |
|
159 | C largeX | |
|
160 | $ hg strip -q 5 | |
|
161 | ||
|
162 | $ hg update -q -C 2 | |
|
163 | $ hg transplant -q --merge 1 --merge 4 | |
|
164 | $ hg status -A large1 | |
|
165 | large1: No such file or directory | |
|
166 | $ hg status -A largeX | |
|
167 | C largeX | |
|
168 | $ hg strip -q 5 | |
|
169 | ||
|
132 | 170 | $ cd .. |
General Comments 0
You need to be logged in to leave comments.
Login now