diff --git a/mercurial/patch.py b/mercurial/patch.py index 1a680ccdb09aa96545157af27b4025ba74b3b635_bWVyY3VyaWFsL3BhdGNoLnB5..72782f60dbc946edde0f96e7ec34f5ee27936fa7_bWVyY3VyaWFsL3BhdGNoLnB5 100644 --- a/mercurial/patch.py +++ b/mercurial/patch.py @@ -271,5 +271,4 @@ data['branch'] = branch return data - p1 = p2 = None if parents: @@ -275,3 +274,3 @@ if parents: - p1 = parents.pop(0) + data['p1'] = parents.pop(0) if parents: @@ -277,8 +276,8 @@ if parents: - p2 = parents.pop(0) + data['p2'] = parents.pop(0) data['filename'] = tmpname data['user'] = user data['date'] = date data['branch'] = branch data['nodeid'] = nodeid @@ -279,11 +278,9 @@ data['filename'] = tmpname data['user'] = user data['date'] = date data['branch'] = branch data['nodeid'] = nodeid - data['p1'] = p1 - data['p2'] = p2 return data class patchmeta(object):