Show More
@@ -1791,7 +1791,7 b' def defineparents(repo, rev, destmap, st' | |||
|
1791 | 1791 | # But our merge base candidates (D and E in above case) could still be |
|
1792 | 1792 | # better than the default (ancestor(F, Z) == null). Therefore still |
|
1793 | 1793 | # pick one (so choose p1 above). |
|
1794 | if sum(1 for b in bases if b != nullrev) > 1: | |
|
1794 | if sum(1 for b in set(bases) if b != nullrev) > 1: | |
|
1795 | 1795 | unwanted = [None, None] # unwanted[i]: unwanted revs if choose bases[i] |
|
1796 | 1796 | for i, base in enumerate(bases): |
|
1797 | 1797 | if base == nullrev: |
General Comments 0
You need to be logged in to leave comments.
Login now