Show More
@@ -26,10 +26,7 b' def _collectfiles(repo, striprev):' | |||||
26 | files = set() |
|
26 | files = set() | |
27 |
|
27 | |||
28 | for x in xrange(striprev, len(repo)): |
|
28 | for x in xrange(striprev, len(repo)): | |
29 |
f |
|
29 | files.update(repo[x].files()) | |
30 | if name in files: |
|
|||
31 | continue |
|
|||
32 | files.add(name) |
|
|||
33 |
|
30 | |||
34 | return sorted(files) |
|
31 | return sorted(files) | |
35 |
|
32 | |||
@@ -100,8 +97,7 b' def strip(ui, repo, node, backup="all"):' | |||||
100 | if parents[0] < striprev and parents[1] < striprev: |
|
97 | if parents[0] < striprev and parents[1] < striprev: | |
101 | savebases.append(cl.node(r)) |
|
98 | savebases.append(cl.node(r)) | |
102 |
|
99 | |||
103 | for p in parents: |
|
100 | saveheads.difference_update(parents) | |
104 | saveheads.discard(p) |
|
|||
105 | saveheads.add(r) |
|
101 | saveheads.add(r) | |
106 |
|
102 | |||
107 | saveheads = [cl.node(r) for r in saveheads] |
|
103 | saveheads = [cl.node(r) for r in saveheads] |
General Comments 0
You need to be logged in to leave comments.
Login now