Show More
@@ -1858,7 +1858,6 b' def _computeobsoletenotrebased(repo, reb' | |||||
1858 | extinctnodes = set(cl.node(r) for r in repo.revs('extinct()')) |
|
1858 | extinctnodes = set(cl.node(r) for r in repo.revs('extinct()')) | |
1859 | for srcrev in rebaseobsrevs: |
|
1859 | for srcrev in rebaseobsrevs: | |
1860 | srcnode = cl.node(srcrev) |
|
1860 | srcnode = cl.node(srcrev) | |
1861 | destnode = cl.node(destmap[srcrev]) |
|
|||
1862 | # XXX: more advanced APIs are required to handle split correctly |
|
1861 | # XXX: more advanced APIs are required to handle split correctly | |
1863 | successors = set(obsutil.allsuccessors(repo.obsstore, [srcnode])) |
|
1862 | successors = set(obsutil.allsuccessors(repo.obsstore, [srcnode])) | |
1864 | # obsutil.allsuccessors includes node itself |
|
1863 | # obsutil.allsuccessors includes node itself | |
@@ -1870,6 +1869,7 b' def _computeobsoletenotrebased(repo, reb' | |||||
1870 | # no successor |
|
1869 | # no successor | |
1871 | obsoletenotrebased[srcrev] = None |
|
1870 | obsoletenotrebased[srcrev] = None | |
1872 | else: |
|
1871 | else: | |
|
1872 | destnode = cl.node(destmap[srcrev]) | |||
1873 | for succnode in successors: |
|
1873 | for succnode in successors: | |
1874 | if succnode not in nodemap: |
|
1874 | if succnode not in nodemap: | |
1875 | continue |
|
1875 | continue |
General Comments 0
You need to be logged in to leave comments.
Login now