mercurial/debugcommands.py
changeset 37146 8bac14ce5778
parent 37123 a8a902d7176e
child 37284 009d0283de5f
--- a/mercurial/debugcommands.py	Wed Mar 28 15:29:49 2018 -0700
+++ b/mercurial/debugcommands.py	Wed Mar 28 15:31:18 2018 -0700
@@ -2288,11 +2288,11 @@
     Returns 0 on success.
     """
 
-    r1 = scmutil.revsingle(repo, rev1).node()
-    r2 = scmutil.revsingle(repo, rev2, 'null').node()
+    node1 = scmutil.revsingle(repo, rev1).node()
+    node2 = scmutil.revsingle(repo, rev2, 'null').node()
 
     with repo.wlock():
-        repo.setparents(r1, r2)
+        repo.setparents(node1, node2)
 
 @command('debugssl', [], '[SOURCE]', optionalrepo=True)
 def debugssl(ui, repo, source=None, **opts):