##// END OF EJS Templates
addremove: correctly handle intermediate symlinks...
addremove: correctly handle intermediate symlinks This fixes problems mentioned in issue660 comments (unrelated to original issue) where directory was renamed, and symlink was added instead. In such situation addremove wasn't able to correctly detect that old files no longer here, but tried to add symlink (and failed due collision with old files).

File last commit:

r6127:25c372e8 default
r6651:7f0dd352 default
Show More
test-bheads
113 lines | 1.4 KiB | text/plain | TextLexer
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 #!/bin/sh
Alexis S. L. Carvalho
Simplify the output of test-bheads...
r6127 heads()
{
hg heads --template '#rev#: #desc|firstline|strip#\n' "$@"
}
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 hg init a
cd a
echo 'root' >root
hg add root
Alexis S. L. Carvalho
Simplify the output of test-bheads...
r6127 hg commit -m "Adding root node"
heads
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 echo '-------'
Alexis S. L. Carvalho
Simplify the output of test-bheads...
r6127 heads .
Eric Hopper
Add option to heads to show only heads for current branch.
r4648
echo '======='
echo 'a' >a
hg add a
hg branch a
Alexis S. L. Carvalho
Simplify the output of test-bheads...
r6127 hg commit -m "Adding a branch"
heads
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 echo '-------'
Alexis S. L. Carvalho
Simplify the output of test-bheads...
r6127 heads .
Eric Hopper
Add option to heads to show only heads for current branch.
r4648
echo '======='
hg update -C 0
echo 'b' >b
hg add b
hg branch b
Alexis S. L. Carvalho
Simplify the output of test-bheads...
r6127 hg commit -m "Adding b branch"
heads
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 echo '-------'
Alexis S. L. Carvalho
Simplify the output of test-bheads...
r6127 heads .
Eric Hopper
Add option to heads to show only heads for current branch.
r4648
echo '======='
echo 'bh1' >bh1
hg add bh1
Alexis S. L. Carvalho
Simplify the output of test-bheads...
r6127 hg commit -m "Adding b branch head 1"
heads
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 echo '-------'
Alexis S. L. Carvalho
Simplify the output of test-bheads...
r6127 heads .
Eric Hopper
Add option to heads to show only heads for current branch.
r4648
echo '======='
hg update -C 2
echo 'bh2' >bh2
hg add bh2
Alexis S. L. Carvalho
Simplify the output of test-bheads...
r6127 hg commit -m "Adding b branch head 2"
heads
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 echo '-------'
Alexis S. L. Carvalho
Simplify the output of test-bheads...
r6127 heads .
Eric Hopper
Add option to heads to show only heads for current branch.
r4648
echo '======='
hg update -C 2
echo 'bh3' >bh3
hg add bh3
Alexis S. L. Carvalho
Simplify the output of test-bheads...
r6127 hg commit -m "Adding b branch head 3"
heads
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 echo '-------'
Alexis S. L. Carvalho
Simplify the output of test-bheads...
r6127 heads .
Eric Hopper
Add option to heads to show only heads for current branch.
r4648
echo '======='
hg merge 4
Alexis S. L. Carvalho
Simplify the output of test-bheads...
r6127 hg commit -m "Merging b branch head 2 and b branch head 3"
heads
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 echo '-------'
Alexis S. L. Carvalho
Simplify the output of test-bheads...
r6127 heads .
Eric Hopper
Add option to heads to show only heads for current branch.
r4648
echo '======='
echo 'c' >c
hg add c
hg branch c
Alexis S. L. Carvalho
Simplify the output of test-bheads...
r6127 hg commit -m "Adding c branch"
heads
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 echo '-------'
Alexis S. L. Carvalho
Simplify the output of test-bheads...
r6127 heads .
Eric Hopper
Add option to heads to show only heads for current branch.
r4648
echo '======='
Alexis S. L. Carvalho
Simplify the output of test-bheads...
r6127 heads -r 3 .
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 echo $?
echo '-------'
Alexis S. L. Carvalho
Simplify the output of test-bheads...
r6127 heads -r 2 .
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 echo $?
echo '-------'
hg update -C 4
echo $?
echo '-------'
Alexis S. L. Carvalho
Simplify the output of test-bheads...
r6127 heads -r 3 .
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 echo $?
echo '-------'
Alexis S. L. Carvalho
Simplify the output of test-bheads...
r6127 heads -r 2 .
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 echo $?
echo '-------'
Alexis S. L. Carvalho
Simplify the output of test-bheads...
r6127 heads -r 7 .
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 echo $?
echo '======='
for i in 0 1 2 3 4 5 6 7; do
hg update -C "$i"
Alexis S. L. Carvalho
Simplify the output of test-bheads...
r6127 heads
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 echo '-------'
Alexis S. L. Carvalho
Simplify the output of test-bheads...
r6127 heads .
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 echo '-------'
done
echo '======='
for i in a b c z; do
Alexis S. L. Carvalho
Simplify the output of test-bheads...
r6127 heads "$i"
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 echo '-------'
done
echo '======='
Alexis S. L. Carvalho
Simplify the output of test-bheads...
r6127 heads 0 1 2 3 4 5 6 7