Mercurial > hgsubversion
comparison wrappers.py @ 269:14914dbd8a4a
More stray prints.
| author | Augie Fackler <durin42@gmail.com> |
|---|---|
| date | Tue, 21 Apr 2009 15:19:50 -0500 |
| parents | f000b2392fc2 |
| children | 5278817fe8a1 |
comparison
equal
deleted
inserted
replaced
| 268:6ec5b5fc5b4d | 269:14914dbd8a4a |
|---|---|
| 159 rebase(hgrebase.rebase, ui, repo, svn=True, svnextrafn=extrafn, | 159 rebase(hgrebase.rebase, ui, repo, svn=True, svnextrafn=extrafn, |
| 160 svnsourcerev=needs_transplant, **opts) | 160 svnsourcerev=needs_transplant, **opts) |
| 161 repo = hg.repository(ui, hge.path) | 161 repo = hg.repository(ui, hge.path) |
| 162 for child in repo[replacement.node()].children(): | 162 for child in repo[replacement.node()].children(): |
| 163 rebasesrc = node.bin(child.extra().get('rebase_source', node.hex(node.nullid))) | 163 rebasesrc = node.bin(child.extra().get('rebase_source', node.hex(node.nullid))) |
| 164 print node.hex(rebasesrc) | |
| 165 if rebasesrc in outgoing: | 164 if rebasesrc in outgoing: |
| 166 print 'swap outgoin' | |
| 167 while rebasesrc in outgoing: | 165 while rebasesrc in outgoing: |
| 168 rebsrcindex = outgoing.index(rebasesrc) | 166 rebsrcindex = outgoing.index(rebasesrc) |
| 169 outgoing = (outgoing[0:rebsrcindex] + | 167 outgoing = (outgoing[0:rebsrcindex] + |
| 170 [child.node(), ] + outgoing[rebsrcindex+1:]) | 168 [child.node(), ] + outgoing[rebsrcindex+1:]) |
| 171 children = [c for c in child.children() if c.branch() == child.branch()] | 169 children = [c for c in child.children() if c.branch() == child.branch()] |
