--- a/hgext/rebase.py Mon Nov 21 21:05:52 2016 -0500
+++ b/hgext/rebase.py Mon Nov 21 21:27:12 2016 -0500
@@ -32,6 +32,7 @@
commands,
copies,
destutil,
+ dirstateguard,
error,
extensions,
hg,
@@ -790,7 +791,7 @@
'''Commit the wd changes with parents p1 and p2. Reuse commit info from rev
but also store useful information in extra.
Return node of committed revision.'''
- dsguard = cmdutil.dirstateguard(repo, 'rebase')
+ dsguard = dirstateguard.dirstateguard(repo, 'rebase')
try:
repo.setparents(repo[p1].node(), repo[p2].node())
ctx = repo[rev]