Show More
@@ -537,6 +537,7 b' def bundle(ui, repo, fname, dest=None, *' | |||
|
537 | 537 | has.update(repo.changelog.reachable(n)) |
|
538 | 538 | if revs: |
|
539 | 539 | visit = list(revs) |
|
540 | has.difference_update(revs) | |
|
540 | 541 | else: |
|
541 | 542 | visit = repo.changelog.heads() |
|
542 | 543 | seen = {} |
@@ -544,7 +545,8 b' def bundle(ui, repo, fname, dest=None, *' | |||
|
544 | 545 | n = visit.pop(0) |
|
545 | 546 | parents = [p for p in repo.changelog.parents(n) if p not in has] |
|
546 | 547 | if len(parents) == 0: |
|
547 |
|
|
|
548 | if n not in has: | |
|
549 | o.append(n) | |
|
548 | 550 | else: |
|
549 | 551 | for p in parents: |
|
550 | 552 | if p not in seen: |
@@ -75,6 +75,8 b' hg -R test bundle --base 3 -r tip test-b' | |||
|
75 | 75 | |
|
76 | 76 | # issue76 msg2163 |
|
77 | 77 | hg -R test bundle --base 3 -r 3 -r 3 test-bundle-cset-3.hg |
|
78 | # issue1910 | |
|
79 | hg -R test bundle --base 7 test-bundle-cset-7.hg | |
|
78 | 80 | |
|
79 | 81 | hg clone test-2 test-9 |
|
80 | 82 | cd test-9 |
@@ -99,6 +101,11 b' hg unbundle ../test-bundle-branch2.hg' | |||
|
99 | 101 | echo % 6 |
|
100 | 102 | hg tip -q |
|
101 | 103 | hg verify |
|
104 | hg rollback | |
|
105 | hg unbundle ../test-bundle-cset-7.hg | |
|
106 | echo % 4 | |
|
107 | hg tip -q | |
|
108 | hg verify | |
|
102 | 109 | |
|
103 | 110 | cd ../test |
|
104 | 111 | hg merge 7 |
@@ -163,6 +163,7 b' 4 changesets found' | |||
|
163 | 163 | 6 changesets found |
|
164 | 164 | 1 changesets found |
|
165 | 165 | 1 changesets found |
|
166 | 4 changesets found | |
|
166 | 167 | updating to branch default |
|
167 | 168 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
168 | 169 | % 2 |
@@ -213,6 +214,19 b' checking manifests' | |||
|
213 | 214 | crosschecking files in changesets and manifests |
|
214 | 215 | checking files |
|
215 | 216 | 3 files, 7 changesets, 6 total revisions |
|
217 | rolling back last transaction | |
|
218 | adding changesets | |
|
219 | adding manifests | |
|
220 | adding file changes | |
|
221 | added 2 changesets with 2 changes to 2 files | |
|
222 | (run 'hg update' to get a working copy) | |
|
223 | % 4 | |
|
224 | 4:836ac62537ab | |
|
225 | checking changesets | |
|
226 | checking manifests | |
|
227 | crosschecking files in changesets and manifests | |
|
228 | checking files | |
|
229 | 2 files, 5 changesets, 5 total revisions | |
|
216 | 230 | warning: detected divergent renames of afile to: |
|
217 | 231 | anotherfile |
|
218 | 232 | adifferentfile |
General Comments 0
You need to be logged in to leave comments.
Login now