Show More
@@ -1,61 +1,63 b'' | |||
|
1 | 1 | #!/bin/sh -e |
|
2 | 2 | |
|
3 | 3 | # test of hg diff --change |
|
4 | 4 | |
|
5 | 5 | set -e |
|
6 | 6 | |
|
7 | 7 | ec() { |
|
8 | 8 | echo "invoking $@:" |
|
9 | 9 | "$@" |
|
10 | 10 | } |
|
11 | 11 | |
|
12 | 12 | hg init a |
|
13 | 13 | cd a |
|
14 | 14 | |
|
15 | 15 | echo "first" > file.txt |
|
16 | 16 | hg add file.txt |
|
17 | 17 | hg commit -m 'first commit' # 0 |
|
18 | 18 | |
|
19 | 19 | echo "second" > file.txt |
|
20 | 20 | hg commit -m 'second commit' # 1 |
|
21 | 21 | |
|
22 | 22 | echo "third" > file.txt |
|
23 | 23 | hg commit -m 'third commit' # 2 |
|
24 | 24 | |
|
25 | 25 | ec hg diff --nodates --change 1 |
|
26 | 26 | |
|
27 | 27 | echo |
|
28 | 28 | |
|
29 | 29 | #rev=$(hg log -r 1 --template '{node|short}') |
|
30 | 30 | rev=e9b286083166 |
|
31 | 31 | ec hg diff --nodates --change "$rev" |
|
32 | 32 | |
|
33 | 33 | ## |
|
34 | 34 | # Testing diff -c when merge |
|
35 | 35 | |
|
36 | 36 | for i in 1 2 3 4 5 6 7 8 9 10; do |
|
37 | 37 | echo $i >> file.txt |
|
38 | 38 | done |
|
39 | 39 | hg commit -m "lots of text" # 3 |
|
40 | 40 | |
|
41 |
sed - |
|
|
41 | sed -e 's,^2$,x,' file.txt > file.txt.tmp | |
|
42 | mv file.txt.tmp file.txt | |
|
42 | 43 | hg commit -m "changed 2 to x" # 4 |
|
43 | 44 | |
|
44 | 45 | hg up -r 3 > /dev/null 2>&1 # updated, merged, removed, unresolved |
|
45 |
sed - |
|
|
46 | sed -e 's,^8$,y,' file.txt > file.txt.tmp | |
|
47 | mv file.txt.tmp file.txt | |
|
46 | 48 | hg commit -m "change 8 to y" > /dev/null 2>&1 # 5 # created new head |
|
47 | 49 | |
|
48 | 50 | hg up -C -r 4 > /dev/null 2>&1 # updated, merged, removed, unresolved |
|
49 | 51 | hg merge -r 5 > /dev/null 2>&1 # updated, merged, removed, unresolved |
|
50 | 52 | hg commit -m "merging 8 to y" # 6 |
|
51 | 53 | |
|
52 | 54 | echo |
|
53 | 55 | ec hg diff --nodates --change 6 # must be similar to hg diff --nodates --change 5 |
|
54 | 56 | |
|
55 | 57 | #echo |
|
56 | 58 | #hg log |
|
57 | 59 | |
|
58 | 60 | echo |
|
59 | 61 | echo "EOF" |
|
60 | 62 | |
|
61 | 63 | # vim: set ts=4 sw=4 et: |
General Comments 0
You need to be logged in to leave comments.
Login now