Mercurial > evolve
comparison hgext/evolve.py @ 907:c17ab719da56
merge with stable
| author | Pierre-Yves David <pierre-yves.david@fb.com> |
|---|---|
| date | Tue, 22 Apr 2014 17:04:40 -0700 |
| parents | 98b5ac44a259 4f84b3307dc2 |
| children | 06100fbc05e5 |
comparison
equal
deleted
inserted
replaced
| 906:24f59f38a202 | 907:c17ab719da56 |
|---|---|
| 806 if not orig.p2().rev() == node.nullrev: | 806 if not orig.p2().rev() == node.nullrev: |
| 807 raise util.Abort( | 807 raise util.Abort( |
| 808 'no support for evolution merge changesets yet', | 808 'no support for evolution merge changesets yet', |
| 809 hint="Redo the merge a use `hg prune` to obsolete the old one") | 809 hint="Redo the merge a use `hg prune` to obsolete the old one") |
| 810 destbookmarks = repo.nodebookmarks(dest.node()) | 810 destbookmarks = repo.nodebookmarks(dest.node()) |
| 811 cmdutil.duplicatecopies(repo, orig.node(), dest.node()) | |
| 812 nodesrc = orig.node() | 811 nodesrc = orig.node() |
| 813 destphase = repo[nodesrc].phase() | 812 destphase = repo[nodesrc].phase() |
| 814 try: | 813 try: |
| 815 r = rebase.rebasenode(repo, orig.node(), dest.node(), | 814 r = rebase.rebasenode(repo, orig.node(), dest.node(), |
| 816 {node.nullrev: node.nullrev}, False) | 815 {node.nullrev: node.nullrev}, False) |
| 817 if r[-1]: #some conflict | 816 if r[-1]: #some conflict |
| 818 raise util.Abort( | 817 raise util.Abort( |
| 819 'unresolved merge conflicts (see hg help resolve)') | 818 'unresolved merge conflicts (see hg help resolve)') |
| 819 cmdutil.duplicatecopies(repo, orig.node(), dest.node()) | |
| 820 nodenew = rebase.concludenode(repo, orig.node(), dest.node(), | 820 nodenew = rebase.concludenode(repo, orig.node(), dest.node(), |
| 821 node.nullid) | 821 node.nullid) |
| 822 except util.Abort, exc: | 822 except util.Abort, exc: |
| 823 class LocalMergeFailure(MergeFailure, exc.__class__): | 823 class LocalMergeFailure(MergeFailure, exc.__class__): |
| 824 pass | 824 pass |