##// END OF EJS Templates
merge with stable
merge with stable

File last commit:

r11673:a2f11188 default
r12278:c4c2ba55 merge default
Show More
test-convert-hg-source
92 lines | 1.7 KiB | text/plain | TextLexer
/ tests / test-convert-hg-source
Alexis S. L. Carvalho
convert: mercurial_source: also search for copies in modified files...
r5280 #!/bin/sh
Bryan O'Sullivan
convert: some tidyups, doc improvements, and test fixes...
r5556 cat >> $HGRCPATH <<EOF
[extensions]
convert=
[convert]
hg.saverev=False
EOF
Alexis S. L. Carvalho
convert: mercurial_source: also search for copies in modified files...
r5280
hg init orig
cd orig
echo foo > foo
echo bar > bar
hg ci -qAm 'add foo bar' -d '0 0'
echo >> foo
Patrick Mezard
test-convert-hg-source: enforce conversion order with --date
r5282 hg ci -m 'change foo' -d '1 0'
Alexis S. L. Carvalho
convert: mercurial_source: also search for copies in modified files...
r5280
hg up -qC 0
hg copy --after --force foo bar
hg copy foo baz
Patrick Mezard
test-convert-hg-source: enforce conversion order with --date
r5282 hg ci -m 'make bar and baz copies of foo' -d '2 0'
Alexis S. L. Carvalho
convert: mercurial_source: also search for copies in modified files...
r5280
hg merge
Patrick Mezard
test-convert-hg-source: enforce conversion order with --date
r5282 hg ci -m 'merge local copy' -d '3 0'
Alexis S. L. Carvalho
convert: mercurial_source: also search for copies in modified files...
r5280
hg up -C 1
hg merge 2
Patrick Mezard
test-convert-hg-source: enforce conversion order with --date
r5282 hg ci -m 'merge remote copy' -d '4 0'
Alexis S. L. Carvalho
convert: mercurial_source: also search for copies in modified files...
r5280
Maxim Dounin
Fix copies reporting in log and convert....
r5811 chmod +x baz
hg ci -m 'mark baz executable' -d '5 0'
Matt Mackall
convert: handle closed branch heads in hg-hg conversion (issue2185)
r11673 hg branch foo
hg ci -m 'branch foo' -d '6 0'
hg ci --close-branch -m 'close' -d '7 0'
Alexis S. L. Carvalho
convert: mercurial_source: also search for copies in modified files...
r5280 cd ..
hg convert --datesort orig new 2>&1 | grep -v 'subversion python bindings could not be loaded'
cd new
hg out ../orig
Patrick Mezard
convert: ignore hg source errors with hg.ignoreerrors (issue 1357)...
r7231 cd ..
Patrick Mezard
convert: make mapfile handle LF and CRLF shamap (issue1846)
r9528 echo '% check shamap LF and CRLF handling'
cat > rewrite.py <<EOF
import sys
# Interlace LF and CRLF
lines = [(l.rstrip() + ((i % 2) and '\n' or '\r\n'))
for i, l in enumerate(file(sys.argv[1]))]
file(sys.argv[1], 'wb').write(''.join(lines))
EOF
python rewrite.py new/.hg/shamap
cd orig
hg up -qC 1
echo foo >> foo
hg ci -qm 'change foo again'
hg up -qC 2
echo foo >> foo
hg ci -qm 'change foo again again'
cd ..
hg convert --datesort orig new 2>&1 | grep -v 'subversion python bindings could not be loaded'
Patrick Mezard
convert: ignore hg source errors with hg.ignoreerrors (issue 1357)...
r7231 echo % init broken repository
hg init broken
cd broken
echo a >> a
echo b >> b
hg ci -qAm init
echo a >> a
echo b >> b
hg copy b c
hg ci -qAm changeall
hg up -qC 0
echo bc >> b
hg ci -m changebagain
HGMERGE=internal:local hg -q merge
hg ci -m merge
hg mv b d
hg ci -m moveb
echo % break it
rm .hg/store/data/b.*
cd ..
hg --config convert.hg.ignoreerrors=True convert broken fixed
hg -R fixed verify
echo '% manifest -r 0'
hg -R fixed manifest -r 0
echo '% manifest -r tip'
hg -R fixed manifest -r tip
Alexis S. L. Carvalho
convert: mercurial_source: also search for copies in modified files...
r5280
true