1194 repo.status = oldstatus |
1194 repo.status = oldstatus |
1195 |
1195 |
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 |
1203 lfdirstate = lfutil.openlfdirstate(ui, repo) |
1208 lfdirstate = lfutil.openlfdirstate(ui, repo) |
1204 orphans = set(lfdirstate) |
1209 orphans = set(lfdirstate) |