##// END OF EJS Templates
largefiles: restore standins from non branch-tip parent at rollback correctly...
FUJIWARA Katsunori -
r22284:72b37865 default
parent child Browse files
Show More
@@ -1202,7 +1202,7 b' def overriderollback(orig, ui, repo, **o'
1202 1202 if before == after:
1203 1203 return result # no need to restore standins
1204 1204
1205 merge.update(repo, node=None, branchmerge=False, force=True,
1205 merge.update(repo, node='.', branchmerge=False, force=True,
1206 1206 partial=lfutil.isstandin)
1207 1207
1208 1208 lfdirstate = lfutil.openlfdirstate(ui, repo)
@@ -152,6 +152,25 b' Test that "hg rollback" restores standin'
152 152 $ cat .hglf/large2
153 153 3cfce6277e7668985707b6887ce56f9f62f6ccd9
154 154
155 (rollback the parent of the working directory, when the parent of it
156 is not branch-tip)
157
158 $ hg update -q -C 1
159 $ cat .hglf/large1
160 58e24f733a964da346e2407a2bee99d9001184f5
161 $ cat .hglf/large2
162 1deebade43c8c498a3c8daddac0244dc55d1331d
163
164 $ echo normalX > normalX
165 $ hg add normalX
166 $ hg commit -m 'will be rollback-ed soon'
167 $ hg rollback -q
168
169 $ cat .hglf/large1
170 58e24f733a964da346e2407a2bee99d9001184f5
171 $ cat .hglf/large2
172 1deebade43c8c498a3c8daddac0244dc55d1331d
173
155 174 Test that "hg status" shows status of largefiles correctly just after
156 175 automated commit like rebase/transplant
157 176
General Comments 0
You need to be logged in to leave comments. Login now