equal
deleted
inserted
replaced
2153 p2 = repo[node] |
2153 p2 = repo[node] |
2154 common = p1.ancestor(p2) |
2154 common = p1.ancestor(p2) |
2155 roots, heads = [common.node()], [p2.node()] |
2155 roots, heads = [common.node()], [p2.node()] |
2156 displayer = cmdutil.show_changeset(ui, repo, opts) |
2156 displayer = cmdutil.show_changeset(ui, repo, opts) |
2157 for node in repo.changelog.nodesbetween(roots=roots, heads=heads)[0]: |
2157 for node in repo.changelog.nodesbetween(roots=roots, heads=heads)[0]: |
2158 displayer.show(repo[node]) |
2158 if node not in roots: |
|
2159 displayer.show(repo[node]) |
2159 return 0 |
2160 return 0 |
2160 |
2161 |
2161 return hg.merge(repo, node, force=opts.get('force')) |
2162 return hg.merge(repo, node, force=opts.get('force')) |
2162 |
2163 |
2163 def outgoing(ui, repo, dest=None, **opts): |
2164 def outgoing(ui, repo, dest=None, **opts): |