##// END OF EJS Templates
keyword: use parent of working copy as base for status...
Martin von Zweigbergk -
r23079:c4ce50a3 stable
parent child Browse files
Show More
@@ -619,7 +619,7 b' def reposetup(ui, repo):'
619 ret = super(kwrepo, self).rollback(dryrun, force)
619 ret = super(kwrepo, self).rollback(dryrun, force)
620 if not dryrun:
620 if not dryrun:
621 ctx = self['.']
621 ctx = self['.']
622 modified, added = _preselect(self[None].status(), changed)
622 modified, added = _preselect(ctx.status(), changed)
623 kwt.overwrite(ctx, modified, True, True)
623 kwt.overwrite(ctx, modified, True, True)
624 kwt.overwrite(ctx, added, True, False)
624 kwt.overwrite(ctx, added, True, False)
625 return ret
625 return ret
@@ -702,7 +702,7 b' def reposetup(ui, repo):'
702 # therefore compare nodes before and after
702 # therefore compare nodes before and after
703 kwt.postcommit = True
703 kwt.postcommit = True
704 ctx = repo['.']
704 ctx = repo['.']
705 wstatus = repo[None].status()
705 wstatus = ctx.status()
706 ret = orig(ui, repo, commitfunc, *pats, **opts)
706 ret = orig(ui, repo, commitfunc, *pats, **opts)
707 recctx = repo['.']
707 recctx = repo['.']
708 if ctx != recctx:
708 if ctx != recctx:
General Comments 0
You need to be logged in to leave comments. Login now