##// END OF EJS Templates
convert/bzr: make it work with filemaps (issue1631)...
convert/bzr: make it work with filemaps (issue1631) The bzr converter maintains a child -> parents mapping and drop entries whenever a child is read. It does not work with filemaps, getchangedfiles() may be called more than once when filtered files belong to merge revisions. getchanges() still works that way but it is not clear whether a similar issue can arise when interacting with merges.

File last commit:

r6385:0d4e068e default
r8165:78658990 default
Show More
test-parentrevspec
69 lines | 1.1 KiB | text/plain | TextLexer
/ tests / test-parentrevspec
Alexis S. L. Carvalho
Add parentrevspec extension
r5194 #!/bin/sh
commit()
{
msg=$1
p1=$2
p2=$3
if [ "$p1" ]; then
hg up -qC $p1
fi
if [ "$p2" ]; then
HGMERGE=true hg merge -q $p2
fi
echo >> foo
Bryan O'Sullivan
commit: when committing the results of a merge, it's all or nothing...
r6385 hg commit -d '0 0' -qAm "$msg"
Alexis S. L. Carvalho
Add parentrevspec extension
r5194 }
hg init repo
cd repo
echo '[extensions]' > .hg/hgrc
echo 'hgext.parentrevspec =' >> .hg/hgrc
commit '0: add foo'
commit '1: change foo 1'
commit '2: change foo 2a'
commit '3: change foo 3a'
commit '4: change foo 2b' 1
commit '5: merge' 3 4
commit '6: change foo again'
hg log --template '#rev#:#node|short# #parents#\n'
echo
lookup()
{
for rev in "$@"; do
printf "$rev: "
hg id -nr $rev
done
true
}
tipnode=`hg id -ir tip`
echo 'should work with tag/branch/node/rev'
for r in tip default $tipnode 6; do
Thomas Arendsen Hein
Quote ^ and ~ chars in test-parentrevspec....
r5199 lookup "$r^"
Alexis S. L. Carvalho
Add parentrevspec extension
r5194 done
echo
echo 'some random lookups'
Thomas Arendsen Hein
Quote ^ and ~ chars in test-parentrevspec....
r5199 lookup "6^^" "6^^^" "6^^^^" "6^^^^^" "6^^^^^^" "6^1" "6^2" "6^^2" "6^1^2" "6^^3"
lookup "6~" "6~1" "6~2" "6~3" "6~4" "6~5" "6~42" "6~1^2" "6~1^2~2"
Alexis S. L. Carvalho
Add parentrevspec extension
r5194 echo
echo 'with a tag "6^" pointing to rev 1'
Thomas Arendsen Hein
Forgot to quote "6^" in test-parentrevspec (see 94e77a174f55)
r5283 hg tag -l -r 1 "6^"
Thomas Arendsen Hein
Quote ^ and ~ chars in test-parentrevspec....
r5199 lookup "6^" "6^1" "6~1" "6^^"
Alexis S. L. Carvalho
Add parentrevspec extension
r5194 echo
echo 'with a tag "foo^bar" pointing to rev 2'
Thomas Arendsen Hein
Quote ^ and ~ chars in test-parentrevspec....
r5199 hg tag -l -r 2 "foo^bar"
lookup "foo^bar" "foo^bar^"
Alexis S. L. Carvalho
Add parentrevspec extension
r5194