test-convert-git.out
100 lines
| 2.2 KiB
| text/plain
|
TextLexer
/ tests / test-convert-git.out
Patrick Mezard
|
r5345 | rm 'd/b' | ||
Patrick Mezard
|
r5219 | assuming destination git-repo-hg | ||
initializing destination git-repo-hg repository | ||||
scanning source... | ||||
sorting... | ||||
converting... | ||||
Patrick Mezard
|
r5345 | 5 t1 | ||
4 t2 | ||||
3 t3 | ||||
2 t4.1 | ||||
1 t4.2 | ||||
Alexis S. L. Carvalho
|
r5335 | 0 Merge branch other | ||
Alexis S. L. Carvalho
|
r6254 | changeset: 5:4ab1af49a271 | ||
Alexis S. L. Carvalho
|
r5335 | tag: tip | ||
Alexis S. L. Carvalho
|
r6254 | parent: 3:0222ab0998d7 | ||
parent: 4:5333c870e3c2 | ||||
Alexis S. L. Carvalho
|
r5335 | user: test <test@example.org> | ||
Patrick Mezard
|
r5345 | date: Mon Jan 01 00:00:15 2007 +0000 | ||
Alexis S. L. Carvalho
|
r5335 | files: a | ||
description: | ||||
Merge branch other | ||||
committer: test <test@example.org> | ||||
Alexis S. L. Carvalho
|
r5380 | % full conversion | ||
Matt Mackall
|
r6737 | @ 9 "Discard change to foo" files: foo | ||
Alexis S. L. Carvalho
|
r5380 | |\ | ||
| o 8 "change foo" files: foo | ||||
| | | ||||
o | 7 "change bar" files: bar | ||||
|/ | ||||
o 6 "(octopus merge fixup)" files: | ||||
|\ | ||||
| o 5 "Octopus merge" files: baz | ||||
| |\ | ||||
o | | 4 "add baz" files: baz | ||||
| | | | ||||
+---o 3 "add bar" files: bar | ||||
| | | ||||
o | 2 "add quux" files: quux | ||||
| | | ||||
| o 1 "change foo" files: foo | ||||
|/ | ||||
o 0 "add foo" files: foo | ||||
Patrick Mezard
|
r5405 | 245a3b8bc653999c2b22cdabd517ccb47aecafdf 644 bar | ||
354ae8da6e890359ef49ade27b68bbc361f3ca88 644 baz | ||||
9277c9cc8dd4576fc01a17939b4351e5ada93466 644 foo | ||||
88dfeab657e8cf2cef3dec67b914f49791ae76b1 644 quux | ||||
Alexis S. L. Carvalho
|
r5380 | % foo bar baz: octopus merge | ||
Matt Mackall
|
r6737 | @ 8 "Discard change to foo" files: foo | ||
Alexis S. L. Carvalho
|
r5380 | |\ | ||
| o 7 "change foo" files: foo | ||||
| | | ||||
o | 6 "change bar" files: bar | ||||
|/ | ||||
o 5 "(octopus merge fixup)" files: | ||||
|\ | ||||
| o 4 "Octopus merge" files: baz | ||||
| |\ | ||||
o | | 3 "add baz" files: baz | ||||
| | | | ||||
+---o 2 "add bar" files: bar | ||||
| | | ||||
| o 1 "change foo" files: foo | ||||
|/ | ||||
o 0 "add foo" files: foo | ||||
Patrick Mezard
|
r5405 | 245a3b8bc653999c2b22cdabd517ccb47aecafdf 644 bar | ||
354ae8da6e890359ef49ade27b68bbc361f3ca88 644 baz | ||||
9277c9cc8dd4576fc01a17939b4351e5ada93466 644 foo | ||||
Alexis S. L. Carvalho
|
r5380 | % foo baz quux: only some parents of an octopus merge; "discard" a head | ||
Matt Mackall
|
r6737 | @ 6 "Discard change to foo" files: foo | ||
Alexis S. L. Carvalho
|
r5380 | | | ||
o 5 "change foo" files: foo | ||||
| | ||||
o 4 "Octopus merge" files: | ||||
|\ | ||||
| o 3 "add baz" files: baz | ||||
| | | ||||
| o 2 "add quux" files: quux | ||||
| | | ||||
o | 1 "change foo" files: foo | ||||
|/ | ||||
o 0 "add foo" files: foo | ||||
Patrick Mezard
|
r5405 | 354ae8da6e890359ef49ade27b68bbc361f3ca88 644 baz | ||
9277c9cc8dd4576fc01a17939b4351e5ada93466 644 foo | ||||
88dfeab657e8cf2cef3dec67b914f49791ae76b1 644 quux | ||||
Patrick Mezard
|
r7222 | |||
% test binary conversion (issue 1359) | ||||
% convert binary file | ||||
initializing destination git-repo3-hg repository | ||||
scanning source... | ||||
sorting... | ||||
converting... | ||||
0 addbinary | ||||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
4096 | ||||