Show More
@@ -14,17 +14,17 b' echo % initialize repository' | |||||
14 | hg init |
|
14 | hg init | |
15 |
|
15 | |||
16 | echo 'a' > a |
|
16 | echo 'a' > a | |
17 |
hg ci -A - |
|
17 | hg ci -A -m "0" | |
18 |
|
18 | |||
19 | echo 'b' > b |
|
19 | echo 'b' > b | |
20 |
hg ci -A - |
|
20 | hg ci -A -m "1" | |
21 |
|
21 | |||
22 | hg up 0 |
|
22 | hg up 0 | |
23 | echo 'c' > c |
|
23 | echo 'c' > c | |
24 |
hg ci -A - |
|
24 | hg ci -A -m "2" | |
25 |
|
25 | |||
26 | echo 'd' > d |
|
26 | echo 'd' > d | |
27 |
hg ci -A - |
|
27 | hg ci -A -m "3" | |
28 |
|
28 | |||
29 | hg bookmark -r 1 one |
|
29 | hg bookmark -r 1 one | |
30 | hg bookmark -r 3 two |
|
30 | hg bookmark -r 3 two |
@@ -4,42 +4,42 b' hg init a' | |||||
4 | cd a |
|
4 | cd a | |
5 | echo 'root' >root |
|
5 | echo 'root' >root | |
6 | hg add root |
|
6 | hg add root | |
7 |
hg commit -d '0 0' - |
|
7 | hg commit -d '0 0' -m "Adding root node" | |
8 |
|
8 | |||
9 | echo 'a' >a |
|
9 | echo 'a' >a | |
10 | hg add a |
|
10 | hg add a | |
11 | hg branch a |
|
11 | hg branch a | |
12 |
hg commit -d '1 0' - |
|
12 | hg commit -d '1 0' -m "Adding a branch" | |
13 |
|
13 | |||
14 | hg branch q |
|
14 | hg branch q | |
15 | echo 'aa' >a |
|
15 | echo 'aa' >a | |
16 | hg branch -C |
|
16 | hg branch -C | |
17 |
hg commit -d '2 0' - |
|
17 | hg commit -d '2 0' -m "Adding to a branch" | |
18 |
|
18 | |||
19 | hg update -C 0 |
|
19 | hg update -C 0 | |
20 | echo 'b' >b |
|
20 | echo 'b' >b | |
21 | hg add b |
|
21 | hg add b | |
22 | hg branch b |
|
22 | hg branch b | |
23 |
hg commit -d '2 0' - |
|
23 | hg commit -d '2 0' -m "Adding b branch" | |
24 |
|
24 | |||
25 | echo 'bh1' >bh1 |
|
25 | echo 'bh1' >bh1 | |
26 | hg add bh1 |
|
26 | hg add bh1 | |
27 |
hg commit -d '3 0' - |
|
27 | hg commit -d '3 0' -m "Adding b branch head 1" | |
28 |
|
28 | |||
29 | hg update -C 2 |
|
29 | hg update -C 2 | |
30 | echo 'bh2' >bh2 |
|
30 | echo 'bh2' >bh2 | |
31 | hg add bh2 |
|
31 | hg add bh2 | |
32 |
hg commit -d '4 0' - |
|
32 | hg commit -d '4 0' -m "Adding b branch head 2" | |
33 |
|
33 | |||
34 | echo 'c' >c |
|
34 | echo 'c' >c | |
35 | hg add c |
|
35 | hg add c | |
36 | hg branch c |
|
36 | hg branch c | |
37 |
hg commit -d '5 0' - |
|
37 | hg commit -d '5 0' -m "Adding c branch" | |
38 |
|
38 | |||
39 | echo 'd' >d |
|
39 | echo 'd' >d | |
40 | hg add d |
|
40 | hg add d | |
41 | hg branch 'a branch name much longer than the default justification used by branches' |
|
41 | hg branch 'a branch name much longer than the default justification used by branches' | |
42 |
hg commit -d '6 0' - |
|
42 | hg commit -d '6 0' -m "Adding d branch" | |
43 |
|
43 | |||
44 | hg branches |
|
44 | hg branches | |
45 | echo '-------' |
|
45 | echo '-------' | |
@@ -55,24 +55,24 b' echo "---- going to test branch closing"' | |||||
55 | hg branches |
|
55 | hg branches | |
56 | hg up -C b |
|
56 | hg up -C b | |
57 | echo 'xxx1' >> b |
|
57 | echo 'xxx1' >> b | |
58 |
hg commit -d '7 0' - |
|
58 | hg commit -d '7 0' -m 'adding cset to branch b' | |
59 | hg up -C aee39cd168d0 |
|
59 | hg up -C aee39cd168d0 | |
60 | echo 'xxx2' >> b |
|
60 | echo 'xxx2' >> b | |
61 |
hg commit -d '8 0' - |
|
61 | hg commit -d '8 0' -m 'adding head to branch b' | |
62 | echo 'xxx3' >> b |
|
62 | echo 'xxx3' >> b | |
63 |
hg commit -d '9 0' - |
|
63 | hg commit -d '9 0' -m 'adding another cset to branch b' | |
64 | hg branches |
|
64 | hg branches | |
65 | hg heads |
|
65 | hg heads | |
66 | hg heads -a |
|
66 | hg heads -a | |
67 |
hg commit -d '9 0' - |
|
67 | hg commit -d '9 0' --close-branch -m 'prune bad branch' | |
68 | hg branches -a |
|
68 | hg branches -a | |
69 | hg up -C b |
|
69 | hg up -C b | |
70 |
hg commit -d '9 0' - |
|
70 | hg commit -d '9 0' --close-branch -m 'close this part branch too' | |
71 | echo '--- b branch should be inactive' |
|
71 | echo '--- b branch should be inactive' | |
72 | hg branches |
|
72 | hg branches | |
73 | hg branches -a |
|
73 | hg branches -a | |
74 | echo 'xxx4' >> b |
|
74 | echo 'xxx4' >> b | |
75 |
hg commit -d '9 0' - |
|
75 | hg commit -d '9 0' -m 'reopen branch with a change' | |
76 | echo '--- branch b is back in action' |
|
76 | echo '--- branch b is back in action' | |
77 | hg branches -a |
|
77 | hg branches -a | |
78 | hg heads |
|
78 | hg heads |
@@ -62,8 +62,8 b' echo foo > foo/foo' | |||||
62 | mkdir bar |
|
62 | mkdir bar | |
63 | echo bar > bar/bar |
|
63 | echo bar > bar/bar | |
64 | hg add |
|
64 | hg add | |
65 |
hg ci -d '1000000 0' - |
|
65 | hg ci -d '1000000 0' -m commit-subdir-1 foo | |
66 |
hg ci -d '1000001 0' - |
|
66 | hg ci -d '1000001 0' -m commit-subdir-2 bar | |
67 | echo % subdir log 1 |
|
67 | echo % subdir log 1 | |
68 | hg log -v foo |
|
68 | hg log -v foo | |
69 | echo % subdir log 2 |
|
69 | echo % subdir log 2 | |
@@ -78,9 +78,9 b' cd test3' | |||||
78 | mkdir foo |
|
78 | mkdir foo | |
79 | echo foo content > foo/plain-file |
|
79 | echo foo content > foo/plain-file | |
80 | hg add foo/plain-file |
|
80 | hg add foo/plain-file | |
81 |
hg ci -d '1000000 0' - |
|
81 | hg ci -d '1000000 0' -m commit-foo-subdir foo | |
82 | echo modified foo content > foo/plain-file |
|
82 | echo modified foo content > foo/plain-file | |
83 |
hg ci -d '2000000 0' - |
|
83 | hg ci -d '2000000 0' -m commit-foo-dot . | |
84 | echo % full log |
|
84 | echo % full log | |
85 | hg log -v |
|
85 | hg log -v | |
86 | echo % subdir log |
|
86 | echo % subdir log |
@@ -6,11 +6,11 b' echo "graphlog=" >> $HGRCPATH' | |||||
6 | addcommit () { |
|
6 | addcommit () { | |
7 | echo $1 > $1 |
|
7 | echo $1 > $1 | |
8 | hg add $1 |
|
8 | hg add $1 | |
9 |
hg commit -d "${2} 0" - |
|
9 | hg commit -d "${2} 0" -m $1 | |
10 | } |
|
10 | } | |
11 |
|
11 | |||
12 | commit () { |
|
12 | commit () { | |
13 |
hg commit -d "${2} 0" - |
|
13 | hg commit -d "${2} 0" -m $1 | |
14 | } |
|
14 | } | |
15 |
|
15 | |||
16 | hg init a |
|
16 | hg init a |
@@ -9,23 +9,23 b' cd a' | |||||
9 | mkdir -p testdir |
|
9 | mkdir -p testdir | |
10 | echo a > testdir/a |
|
10 | echo a > testdir/a | |
11 | hg add testdir/a |
|
11 | hg add testdir/a | |
12 |
hg commit - |
|
12 | hg commit -d '1000000 0' -m a | |
13 | cd .. |
|
13 | cd .. | |
14 |
|
14 | |||
15 | hg clone a b |
|
15 | hg clone a b | |
16 | cd a |
|
16 | cd a | |
17 | echo alpha > testdir/a |
|
17 | echo alpha > testdir/a | |
18 |
hg commit - |
|
18 | hg commit -d '1000000 0' -m remote-change | |
19 | cd .. |
|
19 | cd .. | |
20 |
|
20 | |||
21 | cd b |
|
21 | cd b | |
22 | mkdir testdir/subdir |
|
22 | mkdir testdir/subdir | |
23 | hg mv testdir/a testdir/subdir/a |
|
23 | hg mv testdir/a testdir/subdir/a | |
24 |
hg commit - |
|
24 | hg commit -d '1000000 0' -m move | |
25 | mkdir newdir |
|
25 | mkdir newdir | |
26 | echo beta > newdir/beta |
|
26 | echo beta > newdir/beta | |
27 | hg add newdir/beta |
|
27 | hg add newdir/beta | |
28 |
hg commit - |
|
28 | hg commit -d '1000000 0' -m local-addition | |
29 | hg pull ../a |
|
29 | hg pull ../a | |
30 | hg up -C 2 |
|
30 | hg up -C 2 | |
31 | hg merge |
|
31 | hg merge |
@@ -14,22 +14,22 b' hg init a' | |||||
14 | cd a |
|
14 | cd a | |
15 | echo 'c1' >common |
|
15 | echo 'c1' >common | |
16 | hg add common |
|
16 | hg add common | |
17 |
hg commit -d '0 0' - |
|
17 | hg commit -d '0 0' -m "C1" | |
18 |
|
18 | |||
19 | echo 'c2' >>common |
|
19 | echo 'c2' >>common | |
20 |
hg commit -d '1 0' - |
|
20 | hg commit -d '1 0' -m "C2" | |
21 |
|
21 | |||
22 | echo 'c3' >>common |
|
22 | echo 'c3' >>common | |
23 |
hg commit -d '2 0' - |
|
23 | hg commit -d '2 0' -m "C3" | |
24 |
|
24 | |||
25 | hg update -C 1 |
|
25 | hg update -C 1 | |
26 | echo 'l1' >>extra |
|
26 | echo 'l1' >>extra | |
27 | hg add extra |
|
27 | hg add extra | |
28 |
hg commit -d '3 0' - |
|
28 | hg commit -d '3 0' -m "L1" | |
29 |
|
29 | |||
30 | sed -e 's/c2/l2/' common > common.new |
|
30 | sed -e 's/c2/l2/' common > common.new | |
31 | mv common.new common |
|
31 | mv common.new common | |
32 |
hg commit -d '4 0' - |
|
32 | hg commit -d '4 0' -m "L2" | |
33 |
|
33 | |||
34 | hg glog --template '{rev}: {desc}\n' |
|
34 | hg glog --template '{rev}: {desc}\n' | |
35 |
|
35 |
@@ -9,11 +9,11 b' BASE=`pwd`' | |||||
9 | addcommit () { |
|
9 | addcommit () { | |
10 | echo $1 > $1 |
|
10 | echo $1 > $1 | |
11 | hg add $1 |
|
11 | hg add $1 | |
12 |
hg commit -d "${2} 0" - |
|
12 | hg commit -d "${2} 0" -m $1 | |
13 | } |
|
13 | } | |
14 |
|
14 | |||
15 | commit () { |
|
15 | commit () { | |
16 |
hg commit -d "${2} 0" - |
|
16 | hg commit -d "${2} 0" -m $1 | |
17 | } |
|
17 | } | |
18 |
|
18 | |||
19 | createrepo () { |
|
19 | createrepo () { |
@@ -9,11 +9,11 b' BASE=`pwd`' | |||||
9 | addcommit () { |
|
9 | addcommit () { | |
10 | echo $1 > $1 |
|
10 | echo $1 > $1 | |
11 | hg add $1 |
|
11 | hg add $1 | |
12 |
hg commit -d "${2} 0" - |
|
12 | hg commit -d "${2} 0" -m $1 | |
13 | } |
|
13 | } | |
14 |
|
14 | |||
15 | commit () { |
|
15 | commit () { | |
16 |
hg commit -d "${2} 0" - |
|
16 | hg commit -d "${2} 0" -m $1 | |
17 | } |
|
17 | } | |
18 |
|
18 | |||
19 | createrepo () { |
|
19 | createrepo () { |
@@ -14,26 +14,26 b' hg init a' | |||||
14 | cd a |
|
14 | cd a | |
15 | echo 'c1' >common |
|
15 | echo 'c1' >common | |
16 | hg add common |
|
16 | hg add common | |
17 |
hg commit -d '0 0' - |
|
17 | hg commit -d '0 0' -m "C1" | |
18 |
|
18 | |||
19 | echo 'c2' >>common |
|
19 | echo 'c2' >>common | |
20 |
hg commit -d '1 0' - |
|
20 | hg commit -d '1 0' -m "C2" | |
21 |
|
21 | |||
22 | echo 'c3' >>common |
|
22 | echo 'c3' >>common | |
23 |
hg commit -d '2 0' - |
|
23 | hg commit -d '2 0' -m "C3" | |
24 |
|
24 | |||
25 | hg update -C 1 |
|
25 | hg update -C 1 | |
26 | echo 'l1' >>extra |
|
26 | echo 'l1' >>extra | |
27 | hg add extra |
|
27 | hg add extra | |
28 |
hg commit -d '3 0' - |
|
28 | hg commit -d '3 0' -m "L1" | |
29 |
|
29 | |||
30 | sed -e 's/c2/l2/' common > common.new |
|
30 | sed -e 's/c2/l2/' common > common.new | |
31 | mv common.new common |
|
31 | mv common.new common | |
32 |
hg commit -d '4 0' - |
|
32 | hg commit -d '4 0' -m "L2" | |
33 |
|
33 | |||
34 | echo 'l3' >> extra2 |
|
34 | echo 'l3' >> extra2 | |
35 | hg add extra2 |
|
35 | hg add extra2 | |
36 |
hg commit -d '5 0' - |
|
36 | hg commit -d '5 0' -m "L3" | |
37 |
|
37 | |||
38 | hg glog --template '{rev}: {desc}\n' |
|
38 | hg glog --template '{rev}: {desc}\n' | |
39 |
|
39 |
@@ -9,11 +9,11 b' BASE=`pwd`' | |||||
9 | addcommit () { |
|
9 | addcommit () { | |
10 | echo $1 > $1 |
|
10 | echo $1 > $1 | |
11 | hg add $1 |
|
11 | hg add $1 | |
12 |
hg commit -d "${2} 0" - |
|
12 | hg commit -d "${2} 0" -m $1 | |
13 | } |
|
13 | } | |
14 |
|
14 | |||
15 | commit () { |
|
15 | commit () { | |
16 |
hg commit -d "${2} 0" - |
|
16 | hg commit -d "${2} 0" -m $1 | |
17 | } |
|
17 | } | |
18 |
|
18 | |||
19 | createrepo () { |
|
19 | createrepo () { |
@@ -7,7 +7,7 b' echo "rebase=" >> $HGRCPATH' | |||||
7 | addcommit () { |
|
7 | addcommit () { | |
8 | echo $1 > $1 |
|
8 | echo $1 > $1 | |
9 | hg add $1 |
|
9 | hg add $1 | |
10 |
hg commit -d "${2} 0" - |
|
10 | hg commit -d "${2} 0" -m $1 | |
11 | } |
|
11 | } | |
12 |
|
12 | |||
13 | hg init a |
|
13 | hg init a |
@@ -7,7 +7,7 b' echo "rebase=" >> $HGRCPATH' | |||||
7 | addcommit () { |
|
7 | addcommit () { | |
8 | echo $1 > $1 |
|
8 | echo $1 > $1 | |
9 | hg add $1 |
|
9 | hg add $1 | |
10 |
hg commit -d "${2} 0" - |
|
10 | hg commit -d "${2} 0" -m $1 | |
11 | } |
|
11 | } | |
12 |
|
12 | |||
13 | hg init a |
|
13 | hg init a |
@@ -22,10 +22,10 b' hg qinit -c # This must work even with a' | |||||
22 |
|
22 | |||
23 | echo 'c1' > f |
|
23 | echo 'c1' > f | |
24 | hg add f |
|
24 | hg add f | |
25 |
hg commit -d '0 0' - |
|
25 | hg commit -d '0 0' -m "C1" | |
26 |
|
26 | |||
27 | echo 'r1' > f |
|
27 | echo 'r1' > f | |
28 |
hg commit -d '2 0' - |
|
28 | hg commit -d '2 0' -m "R1" | |
29 |
|
29 | |||
30 | hg up 0 |
|
30 | hg up 0 | |
31 | hg qnew f.patch |
|
31 | hg qnew f.patch |
@@ -13,11 +13,11 b' hg qinit -c # This must work even with a' | |||||
13 |
|
13 | |||
14 | echo 'c1' > c1 |
|
14 | echo 'c1' > c1 | |
15 | hg add c1 |
|
15 | hg add c1 | |
16 |
hg commit -d '0 0' - |
|
16 | hg commit -d '0 0' -m "C1" | |
17 |
|
17 | |||
18 | echo 'r1' > r1 |
|
18 | echo 'r1' > r1 | |
19 | hg add r1 |
|
19 | hg add r1 | |
20 |
hg commit -d '1 0' - |
|
20 | hg commit -d '1 0' -m "R1" | |
21 |
|
21 | |||
22 | hg up 0 |
|
22 | hg up 0 | |
23 | hg qnew p0.patch |
|
23 | hg qnew p0.patch |
@@ -6,11 +6,11 b' echo "rebase=" >> $HGRCPATH' | |||||
6 | addcommit () { |
|
6 | addcommit () { | |
7 | echo $1 > $1 |
|
7 | echo $1 > $1 | |
8 | hg add $1 |
|
8 | hg add $1 | |
9 |
hg commit -d "${2} 0" - |
|
9 | hg commit -d "${2} 0" -m $1 | |
10 | } |
|
10 | } | |
11 |
|
11 | |||
12 | commit () { |
|
12 | commit () { | |
13 |
hg commit -d "${2} 0" - |
|
13 | hg commit -d "${2} 0" -m $1 | |
14 | } |
|
14 | } | |
15 |
|
15 | |||
16 | createrepo () { |
|
16 | createrepo () { |
@@ -9,11 +9,11 b' BASE=`pwd`' | |||||
9 | addcommit () { |
|
9 | addcommit () { | |
10 | echo $1 > $1 |
|
10 | echo $1 > $1 | |
11 | hg add $1 |
|
11 | hg add $1 | |
12 |
hg commit -d "${2} 0" - |
|
12 | hg commit -d "${2} 0" -m $1 | |
13 | } |
|
13 | } | |
14 |
|
14 | |||
15 | commit () { |
|
15 | commit () { | |
16 |
hg commit -d "${2} 0" - |
|
16 | hg commit -d "${2} 0" -m $1 | |
17 | } |
|
17 | } | |
18 |
|
18 | |||
19 | cd $BASE |
|
19 | cd $BASE |
@@ -9,11 +9,11 b' BASE=`pwd`' | |||||
9 | addcommit () { |
|
9 | addcommit () { | |
10 | echo $1 > $1 |
|
10 | echo $1 > $1 | |
11 | hg add $1 |
|
11 | hg add $1 | |
12 |
hg commit -d "${2} 0" - |
|
12 | hg commit -d "${2} 0" -m $1 | |
13 | } |
|
13 | } | |
14 |
|
14 | |||
15 | commit () { |
|
15 | commit () { | |
16 |
hg commit -d "${2} 0" - |
|
16 | hg commit -d "${2} 0" -m $1 | |
17 | } |
|
17 | } | |
18 |
|
18 | |||
19 | createrepo () { |
|
19 | createrepo () { |
General Comments 0
You need to be logged in to leave comments.
Login now