# HG changeset patch # User Siddharth Agarwal # Date 2014-09-17 20:08:03 # Node ID 0c7b018d32585f1f800a3149988892b84770a3b1 # Parent a476ee0b8e799c1b9b82ad2db350c90a31274879 dirstate: copyedit exception for no beginparentchange call diff --git a/mercurial/dirstate.py b/mercurial/dirstate.py --- a/mercurial/dirstate.py +++ b/mercurial/dirstate.py @@ -257,8 +257,8 @@ class dirstate(object): See localrepo.setparents() """ if self._parentwriters == 0: - raise ValueError("cannot set dirstate parent without " + - " calling dirstate.begingparentchange") + raise ValueError("cannot set dirstate parent without " + "calling dirstate.beginparentchange") self._dirty = self._dirtypl = True oldp2 = self._pl[1]