equal
deleted
inserted
replaced
109 if saverevs: |
109 if saverevs: |
110 descendants = set(cl.descendants(saverevs)) |
110 descendants = set(cl.descendants(saverevs)) |
111 saverevs.difference_update(descendants) |
111 saverevs.difference_update(descendants) |
112 savebases = [cl.node(r) for r in saverevs] |
112 savebases = [cl.node(r) for r in saverevs] |
113 stripbases = [cl.node(r) for r in tostrip] |
113 stripbases = [cl.node(r) for r in tostrip] |
114 rset = ' or '.join([str(r) for r in tostrip]) |
114 newbmtarget = repo.revs('sort(heads((::%ld) - (%ld)), -rev)', |
115 newbmtarget = repo.revs('sort(heads(ancestors(%r) - (%r)), -rev)', |
115 tostrip, tostrip) |
116 rset, rset) |
|
117 if newbmtarget: |
116 if newbmtarget: |
118 newbmtarget = newbmtarget[0] |
117 newbmtarget = newbmtarget[0] |
119 else: |
118 else: |
120 newbmtarget = '.' |
119 newbmtarget = '.' |
121 |
120 |