Show More
@@ -989,19 +989,19 b' def calculateupdates(repo, wctx, mctx, a' | |||
|
989 | 989 | if len(bids) == 1: # all bids are the same kind of method |
|
990 | 990 | m, l = bids.items()[0] |
|
991 | 991 | if all(a == l[0] for a in l[1:]): # len(bids) is > 1 |
|
992 | repo.ui.note(" %s: consensus for %s\n" % (f, m)) | |
|
992 | repo.ui.note(_(" %s: consensus for %s\n") % (f, m)) | |
|
993 | 993 | actions[f] = l[0] |
|
994 | 994 | continue |
|
995 | 995 | # If keep is an option, just do it. |
|
996 | 996 | if 'k' in bids: |
|
997 | repo.ui.note(" %s: picking 'keep' action\n" % f) | |
|
997 | repo.ui.note(_(" %s: picking 'keep' action\n") % f) | |
|
998 | 998 | actions[f] = bids['k'][0] |
|
999 | 999 | continue |
|
1000 | 1000 | # If there are gets and they all agree [how could they not?], do it. |
|
1001 | 1001 | if 'g' in bids: |
|
1002 | 1002 | ga0 = bids['g'][0] |
|
1003 | 1003 | if all(a == ga0 for a in bids['g'][1:]): |
|
1004 | repo.ui.note(" %s: picking 'get' action\n" % f) | |
|
1004 | repo.ui.note(_(" %s: picking 'get' action\n") % f) | |
|
1005 | 1005 | actions[f] = ga0 |
|
1006 | 1006 | continue |
|
1007 | 1007 | # TODO: Consider other simple actions such as mode changes |
General Comments 0
You need to be logged in to leave comments.
Login now