Show More
@@ -1,106 +1,110 b'' | |||
|
1 | 1 | #!/bin/sh |
|
2 | 2 | |
|
3 | 3 | echo % commit date test |
|
4 | 4 | hg init test |
|
5 | 5 | cd test |
|
6 | 6 | echo foo > foo |
|
7 | 7 | hg add foo |
|
8 | 8 | HGEDITOR=true hg commit -m "" |
|
9 | 9 | hg commit -d '0 0' -m commit-1 |
|
10 | # An empty date was interpreted as epoch origin | |
|
11 | echo foo >> foo | |
|
12 | hg commit -d '' -m commit-no-date | |
|
13 | hg tip --template '{date|isodate}\n' | grep '1970' | |
|
10 | 14 | echo foo >> foo |
|
11 | 15 | hg commit -d '1 4444444' -m commit-3 |
|
12 | 16 | hg commit -d '1 15.1' -m commit-4 |
|
13 | 17 | hg commit -d 'foo bar' -m commit-5 |
|
14 | 18 | hg commit -d ' 1 4444' -m commit-6 |
|
15 | 19 | hg commit -d '111111111111 0' -m commit-7 |
|
16 | 20 | |
|
17 | 21 | echo % commit added file that has been deleted |
|
18 | 22 | echo bar > bar |
|
19 | 23 | hg add bar |
|
20 | 24 | rm bar |
|
21 | 25 | hg commit -d "1000000 0" -m commit-8 |
|
22 | 26 | hg commit -d "1000000 0" -m commit-8-2 bar |
|
23 | 27 | |
|
24 | 28 | hg -q revert -a --no-backup |
|
25 | 29 | |
|
26 | 30 | mkdir dir |
|
27 | 31 | echo boo > dir/file |
|
28 | 32 | hg add |
|
29 | 33 | hg -v commit -d '0 0' -m commit-9 dir |
|
30 | 34 | |
|
31 | 35 | echo > dir.file |
|
32 | 36 | hg add |
|
33 | 37 | hg commit -d '0 0' -m commit-10 dir dir.file |
|
34 | 38 | |
|
35 | 39 | echo >> dir/file |
|
36 | 40 | mkdir bleh |
|
37 | 41 | mkdir dir2 |
|
38 | 42 | cd bleh |
|
39 | 43 | hg commit -d '0 0' -m commit-11 . |
|
40 | 44 | hg commit -d '0 0' -m commit-12 ../dir ../dir2 |
|
41 | 45 | hg -v commit -d '0 0' -m commit-13 ../dir |
|
42 | 46 | cd .. |
|
43 | 47 | |
|
44 | 48 | hg commit -d '0 0' -m commit-14 does-not-exist |
|
45 | 49 | ln -s foo baz |
|
46 | 50 | hg commit -d '0 0' -m commit-15 baz |
|
47 | 51 | touch quux |
|
48 | 52 | hg commit -d '0 0' -m commit-16 quux |
|
49 | 53 | echo >> dir/file |
|
50 | 54 | hg -v commit -d '0 0' -m commit-17 dir/file |
|
51 | 55 | cd .. |
|
52 | 56 | |
|
53 | 57 | echo % partial subdir commit test |
|
54 | 58 | hg init test2 |
|
55 | 59 | cd test2 |
|
56 | 60 | mkdir foo |
|
57 | 61 | echo foo > foo/foo |
|
58 | 62 | mkdir bar |
|
59 | 63 | echo bar > bar/bar |
|
60 | 64 | hg add |
|
61 | 65 | hg ci -d '1000000 0' -u test -m commit-subdir-1 foo |
|
62 | 66 | hg ci -d '1000001 0' -u test -m commit-subdir-2 bar |
|
63 | 67 | echo % subdir log 1 |
|
64 | 68 | hg log -v foo |
|
65 | 69 | echo % subdir log 2 |
|
66 | 70 | hg log -v bar |
|
67 | 71 | echo % full log |
|
68 | 72 | hg log -v |
|
69 | 73 | cd .. |
|
70 | 74 | |
|
71 | 75 | echo % dot and subdir commit test |
|
72 | 76 | hg init test3 |
|
73 | 77 | cd test3 |
|
74 | 78 | mkdir foo |
|
75 | 79 | echo foo content > foo/plain-file |
|
76 | 80 | hg add foo/plain-file |
|
77 | 81 | hg ci -d '1000000 0' -u test -m commit-foo-subdir foo |
|
78 | 82 | echo modified foo content > foo/plain-file |
|
79 | 83 | hg ci -d '2000000 0' -u test -m commit-foo-dot . |
|
80 | 84 | echo % full log |
|
81 | 85 | hg log -v |
|
82 | 86 | echo % subdir log |
|
83 | 87 | cd foo |
|
84 | 88 | hg log . |
|
85 | 89 | cd .. |
|
86 | 90 | cd .. |
|
87 | 91 | |
|
88 | 92 | cd .. |
|
89 | 93 | hg init issue1049 |
|
90 | 94 | cd issue1049 |
|
91 | 95 | echo a > a |
|
92 | 96 | hg ci -Ama |
|
93 | 97 | echo a >> a |
|
94 | 98 | hg ci -mb |
|
95 | 99 | hg up 0 |
|
96 | 100 | echo b >> a |
|
97 | 101 | hg ci -mc |
|
98 | 102 | HGMERGE=true hg merge |
|
99 | 103 | echo % should fail because we are specifying a file name |
|
100 | 104 | hg ci -mmerge a |
|
101 | 105 | echo % should fail because we are specifying a pattern |
|
102 | 106 | hg ci -mmerge -I a |
|
103 | 107 | echo % should succeed |
|
104 | 108 | hg ci -mmerge |
|
105 | 109 | |
|
106 | 110 | exit 0 |
General Comments 0
You need to be logged in to leave comments.
Login now