Mercurial > hg
comparison hgext/rebase.py @ 38239:ead71b15efd5
merge with stable
| author | Augie Fackler <augie@google.com> |
|---|---|
| date | Wed, 06 Jun 2018 13:31:24 -0400 |
| parents | 64280cd4b454 69d1cafe75f2 |
| children | f4f1fb1cbfb4 |
comparison
equal
deleted
inserted
replaced
| 38238:2b8c8b8d1a06 | 38239:ead71b15efd5 |
|---|---|
| 1813 break | 1813 break |
| 1814 else: | 1814 else: |
| 1815 # If 'srcrev' has a successor in rebase set but none in | 1815 # If 'srcrev' has a successor in rebase set but none in |
| 1816 # destination (which would be catched above), we shall skip it | 1816 # destination (which would be catched above), we shall skip it |
| 1817 # and its descendants to avoid divergence. | 1817 # and its descendants to avoid divergence. |
| 1818 if any(nodemap[s] in destmap for s in successors): | 1818 if any(nodemap[s] in destmap for s in successors |
| 1819 if s in nodemap): | |
| 1819 obsoletewithoutsuccessorindestination.add(srcrev) | 1820 obsoletewithoutsuccessorindestination.add(srcrev) |
| 1820 | 1821 |
| 1821 return ( | 1822 return ( |
| 1822 obsoletenotrebased, | 1823 obsoletenotrebased, |
| 1823 obsoletewithoutsuccessorindestination, | 1824 obsoletewithoutsuccessorindestination, |