2007-06-14 21:58:49 +04:00
|
|
|
#!/bin/sh
|
|
|
|
# test parents command
|
|
|
|
|
2007-07-17 16:08:29 +04:00
|
|
|
hg init repo
|
|
|
|
cd repo
|
2007-06-14 21:58:49 +04:00
|
|
|
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'
|
2007-09-12 01:05:30 +04:00
|
|
|
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
|
2007-06-14 21:58:49 +04:00
|
|
|
|
|
|
|
echo % hg parents
|
|
|
|
hg parents
|
|
|
|
|
|
|
|
echo % hg parents a
|
|
|
|
hg parents a
|
|
|
|
|
2007-09-12 01:05:30 +04:00
|
|
|
echo % hg parents c, single revision
|
|
|
|
hg parents c
|
|
|
|
|
|
|
|
echo % hg parents -r 3 c
|
|
|
|
hg parents -r 3 c
|
|
|
|
|
2007-06-14 21:58:49 +04:00
|
|
|
echo % hg parents -r 2
|
|
|
|
hg parents -r 2
|
|
|
|
|
|
|
|
echo % hg parents -r 2 a
|
|
|
|
hg parents -r 2 a
|
2007-07-17 16:08:29 +04:00
|
|
|
|
|
|
|
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
|
|
|
|
|
2007-09-12 01:05:30 +04:00
|
|
|
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
|
|
|
|
|
2007-07-17 16:08:29 +04:00
|
|
|
true
|