equal
deleted
inserted
replaced
728 actions = manifestmerge(repo, wctx, mctx, ancestors[0], |
728 actions = manifestmerge(repo, wctx, mctx, ancestors[0], |
729 branchmerge, force, |
729 branchmerge, force, |
730 partial, acceptremote, followcopies) |
730 partial, acceptremote, followcopies) |
731 |
731 |
732 else: # only when merge.preferancestor=* - experimentalish code |
732 else: # only when merge.preferancestor=* - experimentalish code |
|
733 repo.ui.status( |
|
734 _("note: merging %s and %s using bids from ancestors %s\n") % |
|
735 (wctx, mctx, _(' and ').join(str(anc) for anc in ancestors))) |
|
736 |
733 # Call for bids |
737 # Call for bids |
734 fbids = {} # mapping filename to list af action bids |
738 fbids = {} # mapping filename to list af action bids |
735 for ancestor in ancestors: |
739 for ancestor in ancestors: |
736 repo.ui.note(_('\ncalculating bids for ancestor %s\n') % ancestor) |
740 repo.ui.note(_('\ncalculating bids for ancestor %s\n') % ancestor) |
737 actions = manifestmerge(repo, wctx, mctx, ancestor, |
741 actions = manifestmerge(repo, wctx, mctx, ancestor, |