Show More
@@ -1869,19 +1869,17 b' def _computeobsoletenotrebased(repo, reb' | |||||
1869 | # no successor |
|
1869 | # no successor | |
1870 | obsoletenotrebased[srcrev] = None |
|
1870 | obsoletenotrebased[srcrev] = None | |
1871 | else: |
|
1871 | else: | |
1872 |
d |
|
1872 | dstrev = destmap[srcrev] | |
1873 | for succnode in successors: |
|
1873 | succrevs = [nodemap[s] for s in successors if s in nodemap] | |
1874 |
|
|
1874 | for succrev in succrevs: | |
1875 | continue |
|
1875 | if cl.isancestorrev(succrev, dstrev): | |
1876 | if cl.isancestor(succnode, destnode): |
|
1876 | obsoletenotrebased[srcrev] = succrev | |
1877 | obsoletenotrebased[srcrev] = nodemap[succnode] |
|
|||
1878 | break |
|
1877 | break | |
1879 | else: |
|
1878 | else: | |
1880 | # If 'srcrev' has a successor in rebase set but none in |
|
1879 | # If 'srcrev' has a successor in rebase set but none in | |
1881 | # destination (which would be catched above), we shall skip it |
|
1880 | # destination (which would be catched above), we shall skip it | |
1882 | # and its descendants to avoid divergence. |
|
1881 | # and its descendants to avoid divergence. | |
1883 |
if any( |
|
1882 | if any(s in destmap for s in succrevs): | |
1884 | if s in nodemap): |
|
|||
1885 | obsoletewithoutsuccessorindestination.add(srcrev) |
|
1883 | obsoletewithoutsuccessorindestination.add(srcrev) | |
1886 |
|
1884 | |||
1887 | return ( |
|
1885 | return ( |
General Comments 0
You need to be logged in to leave comments.
Login now