comparison tests/test-tags @ 2334:737deea2442c

merge with crew.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Sun, 21 May 2006 23:39:25 -0700
parents dbdce3b99988
children
comparison
equal deleted inserted replaced
2333:de0c05afa511 2334:737deea2442c
30 hg merge 1 30 hg merge 1
31 hg id 31 hg id
32 hg status 32 hg status
33 33
34 hg commit -m "merge" -d "1000000 0" 34 hg commit -m "merge" -d "1000000 0"
35
36 # create fake head, make sure tag not visible afterwards
37 cp .hgtags tags
38 hg tag -d "1000000 0" last
39 hg rm .hgtags
40 hg commit -m "remove" -d "1000000 0"
41
42 mv tags .hgtags
43 hg add .hgtags
44 hg commit -m "readd" -d "1000000 0"
45
46 hg tags
47
35 # invalid tags 48 # invalid tags
36 echo "spam" >> .hgtags 49 echo "spam" >> .hgtags
37 echo >> .hgtags 50 echo >> .hgtags
38 echo "foo bar" >> .hgtags 51 echo "foo bar" >> .hgtags
39 echo "$T invalid" | sed "s/..../a5a5/" >> .hg/localtags 52 echo "$T invalid" | sed "s/..../a5a5/" >> .hg/localtags
40 hg commit -m "tags" -d "1000000 0" 53 hg commit -m "tags" -d "1000000 0"
54
55 # report tag parse error on other head
56 hg up 3
57 echo 'x y' >> .hgtags
58 hg commit -m "head" -d "1000000 0"
59
41 hg tags 60 hg tags
42 hg tip 61 hg tip
43 62