##// END OF EJS Templates
commit: when committing the results of a merge, it's all or nothing...
commit: when committing the results of a merge, it's all or nothing Previously, it was possible to commit just one file from a merge, which is essentially always the wrong thing to do. This fixes issue 1049.

File last commit:

r5811:180a3eee default
r6385:0d4e068e default
Show More
test-convert-hg-source
40 lines | 622 B | 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'
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
true