##// END OF EJS Templates
largefiles: omit restoring standins if working parent is not rollbacked...
FUJIWARA Katsunori -
r22283:cb556ea7 default
parent child Browse files
Show More
@@ -1196,7 +1196,12 b' def overridepurge(orig, ui, repo, *dirs,'
1196 def overriderollback(orig, ui, repo, **opts):
1196 def overriderollback(orig, ui, repo, **opts):
1197 wlock = repo.wlock()
1197 wlock = repo.wlock()
1198 try:
1198 try:
1199 before = repo.dirstate.parents()
1199 result = orig(ui, repo, **opts)
1200 result = orig(ui, repo, **opts)
1201 after = repo.dirstate.parents()
1202 if before == after:
1203 return result # no need to restore standins
1204
1200 merge.update(repo, node=None, branchmerge=False, force=True,
1205 merge.update(repo, node=None, branchmerge=False, force=True,
1201 partial=lfutil.isstandin)
1206 partial=lfutil.isstandin)
1202
1207
@@ -129,6 +129,29 b' Test that "hg rollback" restores status '
129 $ hg status -A largeY
129 $ hg status -A largeY
130 ? largeY
130 ? largeY
131
131
132 Test that "hg rollback" restores standins correctly
133
134 $ hg commit -m 'will be rollback-ed soon'
135 $ hg update -q -C 2
136 $ cat large1
137 large1
138 $ cat .hglf/large1
139 4669e532d5b2c093a78eca010077e708a071bb64
140 $ cat large2
141 large2 in #2
142 $ cat .hglf/large2
143 3cfce6277e7668985707b6887ce56f9f62f6ccd9
144
145 $ hg rollback -q -f
146 $ cat large1
147 large1
148 $ cat .hglf/large1
149 4669e532d5b2c093a78eca010077e708a071bb64
150 $ cat large2
151 large2 in #2
152 $ cat .hglf/large2
153 3cfce6277e7668985707b6887ce56f9f62f6ccd9
154
132 Test that "hg status" shows status of largefiles correctly just after
155 Test that "hg status" shows status of largefiles correctly just after
133 automated commit like rebase/transplant
156 automated commit like rebase/transplant
134
157
General Comments 0
You need to be logged in to leave comments. Login now