##// END OF EJS Templates
Fix copies reporting in log and convert....
Fix copies reporting in log and convert. If copy logged in file revision, we report copy for changeset only if file revisions linkrev points back to the changeset in question or both changeset parents contain different file revisions. This fixes extra copies reported when executable bit was changed for previously copied file.

File last commit:

r5811:180a3eee default
r5811:180a3eee default
Show More
test-log
101 lines | 1.3 KiB | text/plain | TextLexer
Vadim Gelfer
log: add -f/--follow option, to follow rename/copy
r2741 #!/bin/sh
hg init a
cd a
echo a > a
hg ci -Ama -d '1 0'
hg cp a b
hg ci -mb -d '2 0'
mkdir dir
hg mv b dir
hg ci -mc -d '3 0'
hg mv a b
Matt Mackall
Fix log regression where log -p file showed diffs for other files
r3837 echo a > d
hg add d
Vadim Gelfer
log: add -f/--follow option, to follow rename/copy
r2741 hg ci -md -d '4 0'
hg mv dir/b e
hg ci -me -d '5 0'
hg log a
echo % -f, directory
hg log -f dir
echo % -f, but no args
hg log -f
echo % one rename
hg log -vf a
echo % many renames
hg log -vf e
Brendan Cully
Test suite for log --follow and --follow-first.
r2785
Brendan Cully
Show copies in hg log....
r3197 echo % log copies
hg log -vC --template '{rev} {file_copies%filecopy}\n'
Brendan Cully
Test case for log --copies on non-linear manifests (issue391)
r3383 echo % log copies, non-linear manifest
hg up -C 3
hg mv dir/b e
echo foo > foo
hg ci -Ame2 -d '6 0'
hg log -vC --template '{rev} {file_copies%filecopy}\n' -r 5
Maxim Dounin
Fix copies reporting in log and convert....
r5811 echo % log copies, execute bit set
chmod +x e
hg ci -me3 -d '7 0'
hg log -vC --template '{rev} {file_copies%filecopy}\n' -r 6
Matt Mackall
Fix log regression where log -p file showed diffs for other files
r3837 echo '% log -p d'
hg log -pv d
Brendan Cully
Test suite for log --follow and --follow-first.
r2785 # log --follow tests
hg init ../follow
cd ../follow
Thomas Arendsen Hein
Issue a warning if "-r ." is used with two working directory parents....
r4510
Brendan Cully
Test suite for log --follow and --follow-first.
r2785 echo base > base
hg ci -Ambase -d '1 0'
echo r1 >> base
hg ci -Amr1 -d '1 0'
echo r2 >> base
hg ci -Amr2 -d '1 0'
hg up -C 1
echo b1 > b1
hg ci -Amb1 -d '1 0'
echo % log -f
hg log -f
hg up -C 0
echo b2 > b2
hg ci -Amb2 -d '1 0'
echo % log -f -r 1:tip
hg log -f -r 1:tip
hg up -C 3
hg merge tip
Thomas Arendsen Hein
Issue a warning if "-r ." is used with two working directory parents....
r4510
echo % log -r . with two parents
hg log -r .
Brendan Cully
Test suite for log --follow and --follow-first.
r2785 hg ci -mm12 -d '1 0'
Thomas Arendsen Hein
Issue a warning if "-r ." is used with two working directory parents....
r4510 echo % log -r . with one parent
hg log -r .
Brendan Cully
Test suite for log --follow and --follow-first.
r2785 echo postm >> b1
hg ci -Amb1.1 -d'1 0'
echo % log --follow-first
hg log --follow-first
Brendan Cully
Test for log --prune.
r2901
echo % log -P 2
hg log -P 2
Alexis S. L. Carvalho
fix hg log -r ''
r3718
echo '% log -r ""'
hg log -r ''
exit 0