Mercurial > evolve
comparison hgext/evolve.py @ 550:362e65fc6146 stable
evolve-cmd: fix merge error detection for external tools.
| author | Pierre-Yves David <pierre-yves.david@logilab.fr> |
|---|---|
| date | Tue, 11 Sep 2012 11:45:00 +0200 |
| parents | b047e9417d96 |
| children | 38fbcc760ec6 |
comparison
equal
deleted
inserted
replaced
| 549:b047e9417d96 | 550:362e65fc6146 |
|---|---|
| 1230 assert orig.p2().rev() == node.nullrev, 'no support yet' | 1230 assert orig.p2().rev() == node.nullrev, 'no support yet' |
| 1231 destbookmarks = repo.nodebookmarks(dest.node()) | 1231 destbookmarks = repo.nodebookmarks(dest.node()) |
| 1232 cmdutil.duplicatecopies(repo, orig.node(), dest.node()) | 1232 cmdutil.duplicatecopies(repo, orig.node(), dest.node()) |
| 1233 nodesrc = orig.node() | 1233 nodesrc = orig.node() |
| 1234 destphase = repo[nodesrc].phase() | 1234 destphase = repo[nodesrc].phase() |
| 1235 if rebase.rebasenode.func_code.co_argcount == 5: | |
| 1236 # rebasenode collapse argument was introduced by | |
| 1237 # d1afbf03e69a (2.3) | |
| 1238 rebase.rebasenode(repo, orig.node(), dest.node(), | |
| 1239 {node.nullrev: node.nullrev}, False) | |
| 1240 else: | |
| 1241 rebase.rebasenode(repo, orig.node(), dest.node(), | |
| 1242 {node.nullrev: node.nullrev}) | |
| 1243 try: | 1235 try: |
| 1236 if rebase.rebasenode.func_code.co_argcount == 5: | |
| 1237 # rebasenode collapse argument was introduced by | |
| 1238 # d1afbf03e69a (2.3) | |
| 1239 r = rebase.rebasenode(repo, orig.node(), dest.node(), | |
| 1240 {node.nullrev: node.nullrev}, False) | |
| 1241 else: | |
| 1242 r = rebase.rebasenode(repo, orig.node(), dest.node(), | |
| 1243 {node.nullrev: node.nullrev}) | |
| 1244 if r[-1]: #some conflict | |
| 1245 raise util.Abort( | |
| 1246 'unresolved merge conflicts (see hg help resolve)') | |
| 1244 nodenew = rebase.concludenode(repo, orig.node(), dest.node(), | 1247 nodenew = rebase.concludenode(repo, orig.node(), dest.node(), |
| 1245 node.nullid) | 1248 node.nullid) |
| 1246 except util.Abort, exc: | 1249 except util.Abort, exc: |
| 1247 class LocalMergeFailure(MergeFailure, exc.__class__): | 1250 class LocalMergeFailure(MergeFailure, exc.__class__): |
| 1248 pass | 1251 pass |