Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-annotate @ 3165:5c93dd0ae413

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Refactor annotate copy support.
author Brendan Cully <brendan@kublai.com>
date Wed, 27 Sep 2006 09:10:21 -0700
parents 14b4ad613dd8
children f8e67b7c57a4
comparison
equal deleted inserted replaced
3164:706277866251 3165:5c93dd0ae413
1 #!/bin/sh 1 #!/bin/sh
2
3 export HGMERGE=true
2 4
3 echo % init 5 echo % init
4 hg init 6 hg init
5 7
6 echo % commit 8 echo % commit
19 echo % annotate -u 21 echo % annotate -u
20 hg annotate -u a 22 hg annotate -u a
21 23
22 echo % annotate -cdnu 24 echo % annotate -cdnu
23 hg annotate -cdnu a 25 hg annotate -cdnu a
26
27 cat <<EOF >>a
28 a
29 a
30 EOF
31 hg ci -ma1 -d '1 0'
32 hg cp a b
33 hg ci -mb -d '1 0'
34 cat <<EOF >> b
35 b
36 b
37 b
38 EOF
39 hg ci -mb2 -d '2 0'
40
41 echo % annotate b
42 hg annotate b
43 echo % annotate -nf b
44 hg annotate -nf b
45
46 hg up -C 2
47 cat <<EOF >> b
48 b
49 c
50 b
51 EOF
52 hg ci -mb2.1 -d '2 0'
53 hg merge
54 hg ci -mmergeb -d '3 0'
55 echo % annotate after merge
56 hg annotate -nf b
57
58 hg up -C 1
59 hg cp a b
60 cat <<EOF > b
61 a
62 z
63 a
64 EOF
65 hg ci -mc -d '3 0'
66 hg merge
67 cat <<EOF >> b
68 b
69 c
70 b
71 EOF
72 echo d >> b
73 hg ci -mmerge2 -d '4 0'
74 echo % annotate after rename merge
75 hg annotate -nf b