test-convert-svn-sink.out
337 lines
| 5.0 KiB
| text/plain
|
TextLexer
/ tests / test-convert-svn-sink.out
|
r5513 | % add | ||
adding a | ||||
|
r5538 | adding d1/d2/b | ||
|
r5513 | % modify | ||
|
r5538 | 1:e0e2b8a9156b | ||
|
r5513 | assuming destination a-hg | ||
|
r10938 | initializing svn repository 'a-hg' | ||
|
r10940 | initializing svn working copy 'a-hg-wc' | ||
|
r5513 | scanning source... | ||
sorting... | ||||
converting... | ||||
1 add a file | ||||
0 modify a file | ||||
At revision 2. | ||||
|
r8049 | 2 2 test . | ||
2 2 test a | ||||
2 1 test d1 | ||||
2 1 test d1/d2 | ||||
2 1 test d1/d2/b | ||||
|
r5513 | <?xml version="1.0"?> | ||
<log> | ||||
<logentry | ||||
revision="2"> | ||||
<author>test</author> | ||||
<date/> | ||||
<paths> | ||||
<path | ||||
action="M">/a</path> | ||||
</paths> | ||||
<msg>modify a file</msg> | ||||
</logentry> | ||||
<logentry | ||||
revision="1"> | ||||
<author>test</author> | ||||
<date/> | ||||
<paths> | ||||
<path | ||||
action="A">/a</path> | ||||
|
r5538 | <path | ||
action="A">/d1</path> | ||||
<path | ||||
action="A">/d1/d2</path> | ||||
<path | ||||
action="A">/d1/d2/b</path> | ||||
|
r5513 | </paths> | ||
<msg>add a file</msg> | ||||
</logentry> | ||||
</log> | ||||
a: | ||||
a | ||||
|
r5538 | d1 | ||
|
r5513 | |||
a-hg-wc: | ||||
a | ||||
|
r5538 | d1 | ||
|
r5513 | same | ||
% rename | ||||
|
r10490 | 2:eb5169441d43 | ||
|
r5513 | assuming destination a-hg | ||
|
r10940 | initializing svn working copy 'a-hg-wc' | ||
|
r5513 | scanning source... | ||
sorting... | ||||
converting... | ||||
0 rename a file | ||||
At revision 3. | ||||
|
r8049 | 3 3 test . | ||
3 3 test b | ||||
3 1 test d1 | ||||
3 1 test d1/d2 | ||||
3 1 test d1/d2/b | ||||
|
r5513 | <?xml version="1.0"?> | ||
<log> | ||||
<logentry | ||||
revision="3"> | ||||
<author>test</author> | ||||
<date/> | ||||
<paths> | ||||
<path | ||||
action="D">/a</path> | ||||
<path | ||||
copyfrom-path="/a" | ||||
copyfrom-rev="2" | ||||
action="A">/b</path> | ||||
</paths> | ||||
<msg>rename a file</msg> | ||||
</logentry> | ||||
</log> | ||||
a: | ||||
b | ||||
|
r5538 | d1 | ||
|
r5513 | |||
a-hg-wc: | ||||
b | ||||
|
r5538 | d1 | ||
|
r5513 | % copy | ||
|
r10490 | 3:60effef6ab48 | ||
|
r5513 | assuming destination a-hg | ||
|
r10940 | initializing svn working copy 'a-hg-wc' | ||
|
r5513 | scanning source... | ||
sorting... | ||||
converting... | ||||
0 copy a file | ||||
At revision 4. | ||||
|
r8049 | 4 4 test . | ||
4 3 test b | ||||
4 4 test c | ||||
4 1 test d1 | ||||
4 1 test d1/d2 | ||||
4 1 test d1/d2/b | ||||
|
r5513 | <?xml version="1.0"?> | ||
<log> | ||||
<logentry | ||||
revision="4"> | ||||
<author>test</author> | ||||
<date/> | ||||
<paths> | ||||
<path | ||||
copyfrom-path="/b" | ||||
copyfrom-rev="3" | ||||
action="A">/c</path> | ||||
</paths> | ||||
<msg>copy a file</msg> | ||||
</logentry> | ||||
</log> | ||||
a: | ||||
b | ||||
c | ||||
|
r5538 | d1 | ||
|
r5513 | |||
a-hg-wc: | ||||
b | ||||
c | ||||
|
r5538 | d1 | ||
|
r5513 | % remove | ||
|
r10490 | 4:87bbe3013fb6 | ||
|
r5513 | assuming destination a-hg | ||
|
r10940 | initializing svn working copy 'a-hg-wc' | ||
|
r5513 | scanning source... | ||
sorting... | ||||
converting... | ||||
0 remove a file | ||||
At revision 5. | ||||
|
r8049 | 5 5 test . | ||
5 4 test c | ||||
5 1 test d1 | ||||
5 1 test d1/d2 | ||||
5 1 test d1/d2/b | ||||
|
r5513 | <?xml version="1.0"?> | ||
<log> | ||||
<logentry | ||||
revision="5"> | ||||
<author>test</author> | ||||
<date/> | ||||
<paths> | ||||
<path | ||||
action="D">/b</path> | ||||
</paths> | ||||
<msg>remove a file</msg> | ||||
</logentry> | ||||
</log> | ||||
a: | ||||
c | ||||
|
r5538 | d1 | ||
|
r5513 | |||
a-hg-wc: | ||||
c | ||||
|
r5538 | d1 | ||
|
r5513 | % executable | ||
|
r10490 | 5:ff42e473c340 | ||
|
r5513 | assuming destination a-hg | ||
|
r10940 | initializing svn working copy 'a-hg-wc' | ||
|
r5513 | scanning source... | ||
sorting... | ||||
converting... | ||||
0 make a file executable | ||||
|
r5811 | At revision 6. | ||
|
r8049 | 6 6 test . | ||
6 6 test c | ||||
6 1 test d1 | ||||
6 1 test d1/d2 | ||||
6 1 test d1/d2/b | ||||
|
r5513 | <?xml version="1.0"?> | ||
<log> | ||||
<logentry | ||||
|
r5811 | revision="6"> | ||
|
r5513 | <author>test</author> | ||
<date/> | ||||
<paths> | ||||
<path | ||||
|
r5811 | action="M">/c</path> | ||
|
r5513 | </paths> | ||
|
r5811 | <msg>make a file executable</msg> | ||
|
r5513 | </logentry> | ||
</log> | ||||
executable | ||||
|
r5698 | % executable in new directory | ||
adding d1/a | ||||
assuming destination a-hg | ||||
|
r10938 | initializing svn repository 'a-hg' | ||
|
r10940 | initializing svn working copy 'a-hg-wc' | ||
|
r5698 | scanning source... | ||
sorting... | ||||
converting... | ||||
0 add executable file in new directory | ||||
At revision 1. | ||||
|
r8049 | 1 1 test . | ||
1 1 test d1 | ||||
1 1 test d1/a | ||||
|
r5698 | <?xml version="1.0"?> | ||
<log> | ||||
<logentry | ||||
revision="1"> | ||||
<author>test</author> | ||||
<date/> | ||||
<paths> | ||||
<path | ||||
action="A">/d1</path> | ||||
<path | ||||
action="A">/d1/a</path> | ||||
</paths> | ||||
<msg>add executable file in new directory</msg> | ||||
</logentry> | ||||
</log> | ||||
executable | ||||
% copy to new directory | ||||
assuming destination a-hg | ||||
|
r10940 | initializing svn working copy 'a-hg-wc' | ||
|
r5698 | scanning source... | ||
sorting... | ||||
converting... | ||||
0 copy file to new directory | ||||
At revision 2. | ||||
|
r8049 | 2 2 test . | ||
2 1 test d1 | ||||
2 1 test d1/a | ||||
2 2 test d2 | ||||
2 2 test d2/a | ||||
|
r5698 | <?xml version="1.0"?> | ||
<log> | ||||
<logentry | ||||
revision="2"> | ||||
<author>test</author> | ||||
<date/> | ||||
<paths> | ||||
<path | ||||
action="A">/d2</path> | ||||
<path | ||||
copyfrom-path="/d1/a" | ||||
copyfrom-rev="1" | ||||
action="A">/d2/a</path> | ||||
</paths> | ||||
<msg>copy file to new directory</msg> | ||||
</logentry> | ||||
</log> | ||||
|
r5513 | % branchy history | ||
adding b | ||||
adding left-1 | ||||
adding left-2 | ||||
1 files updated, 0 files merged, 2 files removed, 0 files unresolved | ||||
adding right-1 | ||||
|
r6336 | created new head | ||
|
r5513 | adding right-2 | ||
3 files updated, 0 files merged, 2 files removed, 0 files unresolved | ||||
|
r6004 | merging b | ||
|
r5513 | warning: conflicts during merge. | ||
merging b failed! | ||||
2 files updated, 0 files merged, 0 files removed, 1 files unresolved | ||||
|
r9468 | use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon | ||
|
r5513 | assuming destination b-hg | ||
|
r10938 | initializing svn repository 'b-hg' | ||
|
r10940 | initializing svn working copy 'b-hg-wc' | ||
|
r5513 | scanning source... | ||
sorting... | ||||
converting... | ||||
5 base | ||||
4 left-1 | ||||
3 left-2 | ||||
2 right-1 | ||||
1 right-2 | ||||
0 merge | ||||
% expect 4 changes | ||||
At revision 4. | ||||
|
r8049 | 4 4 test . | ||
4 3 test b | ||||
4 2 test left-1 | ||||
4 3 test left-2 | ||||
4 4 test right-1 | ||||
4 4 test right-2 | ||||
|
r5513 | <?xml version="1.0"?> | ||
<log> | ||||
<logentry | ||||
revision="4"> | ||||
<author>test</author> | ||||
<date/> | ||||
<paths> | ||||
<path | ||||
action="A">/right-1</path> | ||||
<path | ||||
action="A">/right-2</path> | ||||
</paths> | ||||
<msg>merge</msg> | ||||
</logentry> | ||||
<logentry | ||||
revision="3"> | ||||
<author>test</author> | ||||
<date/> | ||||
<paths> | ||||
<path | ||||
action="M">/b</path> | ||||
<path | ||||
action="A">/left-2</path> | ||||
</paths> | ||||
<msg>left-2</msg> | ||||
</logentry> | ||||
<logentry | ||||
revision="2"> | ||||
<author>test</author> | ||||
<date/> | ||||
<paths> | ||||
<path | ||||
action="M">/b</path> | ||||
<path | ||||
action="A">/left-1</path> | ||||
</paths> | ||||
<msg>left-1</msg> | ||||
</logentry> | ||||
<logentry | ||||
revision="1"> | ||||
<author>test</author> | ||||
<date/> | ||||
<paths> | ||||
<path | ||||
action="A">/b</path> | ||||
</paths> | ||||
<msg>base</msg> | ||||
</logentry> | ||||
</log> | ||||