##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

test-serve: wait before killing to always hide the "killed!" message....
test-serve: wait before killing to always hide the "killed!" message. Without the sleeps slower systems never display never display "killed!" while faster systems sometimes or nearly always display it.
Patrick Mezard - - Load All Authors

File last commit:

r5299:5a4824f6 default
r6000:8e7d6498 default
Show More
test-parents
67 lines | 1.0 KiB | text/plain | TextLexer
/ tests / test-parents
History | Source | Raw |Copy content |Copy permalink
Brendan Cully
Make parents with a file but not a revision use working directory revision.
 r4584 #!/bin/sh
# test parents command
Alexis S. L. Carvalho
hg parents: don't pass an OS-specific path to repo.filectx...
 r4894 hg init repo
cd repo
Brendan Cully
Make parents with a file but not a revision use working directory revision.
 r4584 echo % no working directory
hg parents
echo a > a
echo b > b
hg ci -Amab -d '0 0'
echo a >> a
hg ci -Ama -d '1 0'
echo b >> b
hg ci -Amb -d '2 0'
Patrick Mezard
Test parents behaviour with files.
 r5299 echo c > c
hg ci -Amc -d '3 0'
hg up -C 1
echo d > c
hg ci -Amc2 -d '4 0'
hg up -C 3
Brendan Cully
Make parents with a file but not a revision use working directory revision.
 r4584
echo % hg parents
hg parents
echo % hg parents a
hg parents a
Patrick Mezard
Test parents behaviour with files.
 r5299 echo % hg parents c, single revision
hg parents c
echo % hg parents -r 3 c
hg parents -r 3 c
Brendan Cully
Make parents with a file but not a revision use working directory revision.
 r4584 echo % hg parents -r 2
hg parents -r 2
echo % hg parents -r 2 a
hg parents -r 2 a
Alexis S. L. Carvalho
hg parents: don't pass an OS-specific path to repo.filectx...
 r4894
echo % hg parents -r 2 ../a
hg parents -r 2 ../a
echo '% cd dir; hg parents -r 2 ../a'
mkdir dir
cd dir
hg parents -r 2 ../a
echo '% hg parents -r 2 path:a'
hg parents -r 2 path:a
echo '% hg parents -r 2 glob:a'
cd ..
hg parents -r 2 glob:a
Patrick Mezard
Test parents behaviour with files.
 r5299 echo % merge working dir with 2 parents, hg parents c
HGMERGE=true hg merge
hg parents c
echo % merge working dir with 1 parent, hg parents
hg up -C 2
HGMERGE=true hg merge -r 4
hg parents
echo % merge working dir with 1 parent, hg parents c
hg parents c
Alexis S. L. Carvalho
hg parents: don't pass an OS-specific path to repo.filectx...
 r4894 true