Show More
@@ -111,9 +111,8 b' def strip(ui, repo, nodelist, backup="al' | |||||
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: |
General Comments 0
You need to be logged in to leave comments.
Login now