[PATCH 2 of 5] Removing broken branchmap splicepoint functionality
Michael J. Pedersen
m.pedersen at icelus.org
Wed May 13 13:28:51 CDT 2009
# HG changeset patch
# User Michael J. Pedersen <m.pedersen at icelus.org>
# Date 1242221205 14400
# Node ID 1a93340655036f33368f2a7333e4911f64d98eb7
# Parent fd3ccd1cb6678eedf5886881f07011d6e9e8135d
Removing broken branchmap splicepoint functionality.
If this line were left in, then all branch revisions would be given the
same parent, resulting in either a corrupted repository or very badly
mangled revision and branching history.
diff -r fd3ccd1cb667 -r 1a9334065503 hgext/convert/convcmd.py
--- a/hgext/convert/convcmd.py Wed May 13 01:02:28 2009 -0400
+++ b/hgext/convert/convcmd.py Wed May 13 09:26:45 2009 -0400
@@ -252,7 +252,6 @@
self.dest.setbranch(commit.branch, pbranches)
try:
parents = self.splicemap[rev].replace(',', ' ').split()
- parents.extend(self.branchmap.get(commit.branch, '').replace(',', ' ').split()[1:])
self.ui.status(_('spliced in %s as parents of %s\n') %
(parents, rev))
parents = [self.map.get(p, p) for p in parents]
More information about the Mercurial-devel
mailing list