equal
deleted
inserted
replaced
130 |
130 |
131 splitrepo 'octopus merge' 'foo bar baz' |
131 splitrepo 'octopus merge' 'foo bar baz' |
132 |
132 |
133 splitrepo 'only some parents of an octopus merge; "discard" a head' 'foo baz quux' |
133 splitrepo 'only some parents of an octopus merge; "discard" a head' 'foo baz quux' |
134 |
134 |
|
135 echo |
|
136 echo '% test binary conversion (issue 1359)' |
|
137 mkdir git-repo3 |
|
138 cd git-repo3 |
|
139 git init-db >/dev/null 2>/dev/null |
|
140 python -c 'file("b", "wb").write("".join([chr(i) for i in range(256)])*16)' |
|
141 git add b |
|
142 commit -a -m addbinary |
|
143 cd .. |
|
144 |
|
145 echo '% convert binary file' |
|
146 hg convert git-repo3 git-repo3-hg |
|
147 |
|
148 cd git-repo3-hg |
|
149 hg up -C |
|
150 python -c 'print len(file("b", "rb").read())' |
|
151 |