| krbullock |
| hg-reviewers |
The changes I see on the buildbot match the ones I see on my laptop,
and all look reasonable.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| #require svn svn-bindings | #require svn svn-bindings | ||||
| $ cat >> $HGRCPATH <<EOF | $ cat >> $HGRCPATH <<EOF | ||||
| > [extensions] | > [extensions] | ||||
| > convert = | > convert = | ||||
| > EOF | > EOF | ||||
| $ svnadmin create svn-repo | $ svnadmin create svn-repo | ||||
| $ svnadmin load -q svn-repo < "$TESTDIR/svn/encoding.svndump" | $ svnadmin load -q svn-repo < "$TESTDIR/svn/encoding.svndump" | ||||
| Convert while testing all possible outputs | Convert while testing all possible outputs | ||||
| $ hg --debug convert svn-repo A-hg --config progress.debug=1 | $ hg --debug convert svn-repo A-hg --config progress.debug=1 | ||||
| initializing destination A-hg repository | initializing destination A-hg repository | ||||
| reparent to file://*/svn-repo (glob) | reparent to file:/*/$TESTTMP/svn-repo (glob) | ||||
| run hg sink pre-conversion action | run hg sink pre-conversion action | ||||
| scanning source... | scanning source... | ||||
| found trunk at 'trunk' | found trunk at 'trunk' | ||||
| found tags at 'tags' | found tags at 'tags' | ||||
| found branches at 'branches' | found branches at 'branches' | ||||
| found branch branch\xc3\xa9 at 5 (esc) | found branch branch\xc3\xa9 at 5 (esc) | ||||
| found branch branch\xc3\xa9e at 6 (esc) | found branch branch\xc3\xa9e at 6 (esc) | ||||
| scanning: 1/4 revisions (25.00%) | scanning: 1/4 revisions (25.00%) | ||||
| reparent to file://*/svn-repo/trunk (glob) | reparent to file:/*/$TESTTMP/svn-repo/trunk (glob) | ||||
| fetching revision log for "/trunk" from 4 to 0 | fetching revision log for "/trunk" from 4 to 0 | ||||
| parsing revision 4 (2 changes) | parsing revision 4 (2 changes) | ||||
| parsing revision 3 (4 changes) | parsing revision 3 (4 changes) | ||||
| parsing revision 2 (3 changes) | parsing revision 2 (3 changes) | ||||
| parsing revision 1 (3 changes) | parsing revision 1 (3 changes) | ||||
| no copyfrom path, don't know what to do. | no copyfrom path, don't know what to do. | ||||
| '/branches' is not under '/trunk', ignoring | '/branches' is not under '/trunk', ignoring | ||||
| '/tags' is not under '/trunk', ignoring | '/tags' is not under '/trunk', ignoring | ||||
| scanning: 2/4 revisions (50.00%) | scanning: 2/4 revisions (50.00%) | ||||
| reparent to file://*/svn-repo/branches/branch%C3%A9 (glob) | reparent to file:/*/$TESTTMP/svn-repo/branches/branch%C3%A9 (glob) | ||||
| fetching revision log for "/branches/branch\xc3\xa9" from 5 to 0 (esc) | fetching revision log for "/branches/branch\xc3\xa9" from 5 to 0 (esc) | ||||
| parsing revision 5 (1 changes) | parsing revision 5 (1 changes) | ||||
| reparent to file://*/svn-repo (glob) | reparent to file:/*/$TESTTMP/svn-repo (glob) | ||||
| reparent to file://*/svn-repo/branches/branch%C3%A9 (glob) | reparent to file:/*/$TESTTMP/svn-repo/branches/branch%C3%A9 (glob) | ||||
| found parent of branch /branches/branch\xc3\xa9 at 4: /trunk (esc) | found parent of branch /branches/branch\xc3\xa9 at 4: /trunk (esc) | ||||
| scanning: 3/4 revisions (75.00%) | scanning: 3/4 revisions (75.00%) | ||||
| reparent to file://*/svn-repo/branches/branch%C3%A9e (glob) | reparent to file:/*/$TESTTMP/svn-repo/branches/branch%C3%A9e (glob) | ||||
| fetching revision log for "/branches/branch\xc3\xa9e" from 6 to 0 (esc) | fetching revision log for "/branches/branch\xc3\xa9e" from 6 to 0 (esc) | ||||
| parsing revision 6 (1 changes) | parsing revision 6 (1 changes) | ||||
| reparent to file://*/svn-repo (glob) | reparent to file:/*/$TESTTMP/svn-repo (glob) | ||||
| reparent to file://*/svn-repo/branches/branch%C3%A9e (glob) | reparent to file:/*/$TESTTMP/svn-repo/branches/branch%C3%A9e (glob) | ||||
| found parent of branch /branches/branch\xc3\xa9e at 5: /branches/branch\xc3\xa9 (esc) | found parent of branch /branches/branch\xc3\xa9e at 5: /branches/branch\xc3\xa9 (esc) | ||||
| scanning: 4/4 revisions (100.00%) | scanning: 4/4 revisions (100.00%) | ||||
| scanning: 5/4 revisions (125.00%) | scanning: 5/4 revisions (125.00%) | ||||
| scanning: 6/4 revisions (150.00%) | scanning: 6/4 revisions (150.00%) | ||||
| sorting... | sorting... | ||||
| converting... | converting... | ||||
| 5 init projA | 5 init projA | ||||
| source: svn:afeb9c47-92ff-4c0c-9f72-e1f6eb8ac9af/trunk@1 | source: svn:afeb9c47-92ff-4c0c-9f72-e1f6eb8ac9af/trunk@1 | ||||
| converting: 0/6 revisions (0.00%) | converting: 0/6 revisions (0.00%) | ||||
| committing changelog | committing changelog | ||||
| updating the branch cache | updating the branch cache | ||||
| 4 hello | 4 hello | ||||
| source: svn:afeb9c47-92ff-4c0c-9f72-e1f6eb8ac9af/trunk@2 | source: svn:afeb9c47-92ff-4c0c-9f72-e1f6eb8ac9af/trunk@2 | ||||
| converting: 1/6 revisions (16.67%) | converting: 1/6 revisions (16.67%) | ||||
| reparent to file://*/svn-repo/trunk (glob) | reparent to file:/*/$TESTTMP/svn-repo/trunk (glob) | ||||
| scanning paths: /trunk/\xc3\xa0 0/3 paths (0.00%) (esc) | scanning paths: /trunk/\xc3\xa0 0/3 paths (0.00%) (esc) | ||||
| scanning paths: /trunk/\xc3\xa0/e\xcc\x81 1/3 paths (33.33%) (esc) | scanning paths: /trunk/\xc3\xa0/e\xcc\x81 1/3 paths (33.33%) (esc) | ||||
| scanning paths: /trunk/\xc3\xa9 2/3 paths (66.67%) (esc) | scanning paths: /trunk/\xc3\xa9 2/3 paths (66.67%) (esc) | ||||
| committing files: | committing files: | ||||
| \xc3\xa0/e\xcc\x81 (esc) | \xc3\xa0/e\xcc\x81 (esc) | ||||
| getting files: \xc3\xa0/e\xcc\x81 1/2 files (50.00%) (esc) | getting files: \xc3\xa0/e\xcc\x81 1/2 files (50.00%) (esc) | ||||
| \xc3\xa9 (esc) | \xc3\xa9 (esc) | ||||
| getting files: \xc3\xa9 2/2 files (100.00%) (esc) | getting files: \xc3\xa9 2/2 files (100.00%) (esc) | ||||
| committing manifest | committing manifest | ||||
| committing changelog | committing changelog | ||||
| updating the branch cache | updating the branch cache | ||||
| 3 copy files | 3 copy files | ||||
| source: svn:afeb9c47-92ff-4c0c-9f72-e1f6eb8ac9af/trunk@3 | source: svn:afeb9c47-92ff-4c0c-9f72-e1f6eb8ac9af/trunk@3 | ||||
| converting: 2/6 revisions (33.33%) | converting: 2/6 revisions (33.33%) | ||||
| scanning paths: /trunk/\xc3\xa0 0/4 paths (0.00%) (esc) | scanning paths: /trunk/\xc3\xa0 0/4 paths (0.00%) (esc) | ||||
| gone from -1 | gone from -1 | ||||
| reparent to file://*/svn-repo (glob) | reparent to file:/*/$TESTTMP/svn-repo (glob) | ||||
| reparent to file://*/svn-repo/trunk (glob) | reparent to file:/*/$TESTTMP/svn-repo/trunk (glob) | ||||
| scanning paths: /trunk/\xc3\xa8 1/4 paths (25.00%) (esc) | scanning paths: /trunk/\xc3\xa8 1/4 paths (25.00%) (esc) | ||||
| copied to \xc3\xa8 from \xc3\xa9@2 (esc) | copied to \xc3\xa8 from \xc3\xa9@2 (esc) | ||||
| scanning paths: /trunk/\xc3\xa9 2/4 paths (50.00%) (esc) | scanning paths: /trunk/\xc3\xa9 2/4 paths (50.00%) (esc) | ||||
| gone from -1 | gone from -1 | ||||
| reparent to file://*/svn-repo (glob) | reparent to file:/*/$TESTTMP/svn-repo (glob) | ||||
| reparent to file://*/svn-repo/trunk (glob) | reparent to file:/*/$TESTTMP/svn-repo/trunk (glob) | ||||
| scanning paths: /trunk/\xc3\xb9 3/4 paths (75.00%) (esc) | scanning paths: /trunk/\xc3\xb9 3/4 paths (75.00%) (esc) | ||||
| mark /trunk/\xc3\xb9 came from \xc3\xa0:2 (esc) | mark /trunk/\xc3\xb9 came from \xc3\xa0:2 (esc) | ||||
| getting files: \xc3\xa0/e\xcc\x81 1/4 files (25.00%) (esc) | getting files: \xc3\xa0/e\xcc\x81 1/4 files (25.00%) (esc) | ||||
| getting files: \xc3\xa9 2/4 files (50.00%) (esc) | getting files: \xc3\xa9 2/4 files (50.00%) (esc) | ||||
| committing files: | committing files: | ||||
| \xc3\xa8 (esc) | \xc3\xa8 (esc) | ||||
| getting files: \xc3\xa8 3/4 files (75.00%) (esc) | getting files: \xc3\xa8 3/4 files (75.00%) (esc) | ||||
| \xc3\xa8: copy \xc3\xa9:6b67ccefd5ce6de77e7ead4f5292843a0255329f (esc) | \xc3\xa8: copy \xc3\xa9:6b67ccefd5ce6de77e7ead4f5292843a0255329f (esc) | ||||
| \xc3\xb9/e\xcc\x81 (esc) | \xc3\xb9/e\xcc\x81 (esc) | ||||
| getting files: \xc3\xb9/e\xcc\x81 4/4 files (100.00%) (esc) | getting files: \xc3\xb9/e\xcc\x81 4/4 files (100.00%) (esc) | ||||
| \xc3\xb9/e\xcc\x81: copy \xc3\xa0/e\xcc\x81:a9092a3d84a37b9993b5c73576f6de29b7ea50f6 (esc) | \xc3\xb9/e\xcc\x81: copy \xc3\xa0/e\xcc\x81:a9092a3d84a37b9993b5c73576f6de29b7ea50f6 (esc) | ||||
| committing manifest | committing manifest | ||||
| committing changelog | committing changelog | ||||
| updating the branch cache | updating the branch cache | ||||
| 2 remove files | 2 remove files | ||||
| source: svn:afeb9c47-92ff-4c0c-9f72-e1f6eb8ac9af/trunk@4 | source: svn:afeb9c47-92ff-4c0c-9f72-e1f6eb8ac9af/trunk@4 | ||||
| converting: 3/6 revisions (50.00%) | converting: 3/6 revisions (50.00%) | ||||
| scanning paths: /trunk/\xc3\xa8 0/2 paths (0.00%) (esc) | scanning paths: /trunk/\xc3\xa8 0/2 paths (0.00%) (esc) | ||||
| gone from -1 | gone from -1 | ||||
| reparent to file://*/svn-repo (glob) | reparent to file:/*/$TESTTMP/svn-repo (glob) | ||||
| reparent to file://*/svn-repo/trunk (glob) | reparent to file:/*/$TESTTMP/svn-repo/trunk (glob) | ||||
| scanning paths: /trunk/\xc3\xb9 1/2 paths (50.00%) (esc) | scanning paths: /trunk/\xc3\xb9 1/2 paths (50.00%) (esc) | ||||
| gone from -1 | gone from -1 | ||||
| reparent to file://*/svn-repo (glob) | reparent to file:/*/$TESTTMP/svn-repo (glob) | ||||
| reparent to file://*/svn-repo/trunk (glob) | reparent to file:/*/$TESTTMP/svn-repo/trunk (glob) | ||||
| getting files: \xc3\xa8 1/2 files (50.00%) (esc) | getting files: \xc3\xa8 1/2 files (50.00%) (esc) | ||||
| getting files: \xc3\xb9/e\xcc\x81 2/2 files (100.00%) (esc) | getting files: \xc3\xb9/e\xcc\x81 2/2 files (100.00%) (esc) | ||||
| committing files: | committing files: | ||||
| committing manifest | committing manifest | ||||
| committing changelog | committing changelog | ||||
| updating the branch cache | updating the branch cache | ||||
| 1 branch to branch? | 1 branch to branch? | ||||
| source: svn:afeb9c47-92ff-4c0c-9f72-e1f6eb8ac9af/branches/branch?@5 | source: svn:afeb9c47-92ff-4c0c-9f72-e1f6eb8ac9af/branches/branch?@5 | ||||
| converting: 4/6 revisions (66.67%) | converting: 4/6 revisions (66.67%) | ||||
| reparent to file://*/svn-repo/branches/branch%C3%A9 (glob) | reparent to file:/*/$TESTTMP/svn-repo/branches/branch%C3%A9 (glob) | ||||
| scanning paths: /branches/branch\xc3\xa9 0/1 paths (0.00%) (esc) | scanning paths: /branches/branch\xc3\xa9 0/1 paths (0.00%) (esc) | ||||
| committing changelog | committing changelog | ||||
| updating the branch cache | updating the branch cache | ||||
| 0 branch to branch?e | 0 branch to branch?e | ||||
| source: svn:afeb9c47-92ff-4c0c-9f72-e1f6eb8ac9af/branches/branch?e@6 | source: svn:afeb9c47-92ff-4c0c-9f72-e1f6eb8ac9af/branches/branch?e@6 | ||||
| converting: 5/6 revisions (83.33%) | converting: 5/6 revisions (83.33%) | ||||
| reparent to file://*/svn-repo/branches/branch%C3%A9e (glob) | reparent to file:/*/$TESTTMP/svn-repo/branches/branch%C3%A9e (glob) | ||||
| scanning paths: /branches/branch\xc3\xa9e 0/1 paths (0.00%) (esc) | scanning paths: /branches/branch\xc3\xa9e 0/1 paths (0.00%) (esc) | ||||
| committing changelog | committing changelog | ||||
| updating the branch cache | updating the branch cache | ||||
| reparent to file://*/svn-repo (glob) | reparent to file:/*/$TESTTMP/svn-repo (glob) | ||||
| reparent to file://*/svn-repo/branches/branch%C3%A9e (glob) | reparent to file:/*/$TESTTMP/svn-repo/branches/branch%C3%A9e (glob) | ||||
| reparent to file://*/svn-repo (glob) | reparent to file:/*/$TESTTMP/svn-repo (glob) | ||||
| reparent to file://*/svn-repo/branches/branch%C3%A9e (glob) | reparent to file:/*/$TESTTMP/svn-repo/branches/branch%C3%A9e (glob) | ||||
| updating tags | updating tags | ||||
| committing files: | committing files: | ||||
| .hgtags | .hgtags | ||||
| committing manifest | committing manifest | ||||
| committing changelog | committing changelog | ||||
| updating the branch cache | updating the branch cache | ||||
| run hg sink post-conversion action | run hg sink post-conversion action | ||||
| $ cd A-hg | $ cd A-hg | ||||