Show More
@@ -27,9 +27,31 b' Initial setup' | |||
|
27 | 27 | $ hg commit -m "initial commit" |
|
28 | 28 | $ cd .. |
|
29 | 29 | |
|
30 | $ hg init base-exec | |
|
31 | $ cd base-exec | |
|
32 | $ cat << EOF > a | |
|
33 | > 1 | |
|
34 | > 2 | |
|
35 | > 3 | |
|
36 | > 4 | |
|
37 | > 5 | |
|
38 | > 6 | |
|
39 | > 7 | |
|
40 | > 8 | |
|
41 | > 9 | |
|
42 | > EOF | |
|
43 | $ chmod +x a | |
|
44 | $ touch b | |
|
45 | $ hg add a b | |
|
46 | $ hg commit -m "initial commit" | |
|
47 | $ cd .. | |
|
48 | ||
|
30 | 49 | Testing merging mode change |
|
31 | 50 | =========================== |
|
32 | 51 | |
|
52 | Adding the flag | |
|
53 | --------------- | |
|
54 | ||
|
33 | 55 | setup |
|
34 | 56 | |
|
35 | 57 | Change on one side, executable bit on the other |
@@ -80,6 +102,63 b' merge them (from the chmod side)' | |||
|
80 | 102 | |
|
81 | 103 | $ cd .. |
|
82 | 104 | |
|
105 | ||
|
106 | Removing the flag | |
|
107 | ----------------- | |
|
108 | ||
|
109 | setup | |
|
110 | ||
|
111 | Change on one side, executable bit on the other | |
|
112 | ||
|
113 | $ hg clone base-exec simple-merge-repo-removal | |
|
114 | updating to branch default | |
|
115 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
116 | $ cd simple-merge-repo-removal | |
|
117 | $ chmod -x a | |
|
118 | $ hg ci -m "make a non-executable, no change" | |
|
119 | $ [ -x a ] && echo "executable bit not removed" | |
|
120 | [1] | |
|
121 | $ hg up ".^" | |
|
122 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
123 | $ cat << EOF > a | |
|
124 | > 1 | |
|
125 | > 2 | |
|
126 | > 3 | |
|
127 | > 4 | |
|
128 | > 5 | |
|
129 | > 6 | |
|
130 | > 7 | |
|
131 | > x | |
|
132 | > 9 | |
|
133 | > EOF | |
|
134 | $ hg commit -m "edit end of file" | |
|
135 | created new head | |
|
136 | ||
|
137 | merge them (from the update side) | |
|
138 | ||
|
139 | $ hg merge 'desc("make a non-executable, no change")' | |
|
140 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
141 | (branch merge, don't forget to commit) | |
|
142 | $ hg st | |
|
143 | M a | |
|
144 | $ [ -x a ] && echo "executable bit not removed" | |
|
145 | [1] | |
|
146 | ||
|
147 | merge them (from the chmod side) | |
|
148 | ||
|
149 | $ hg up -C 'desc("make a non-executable, no change")' | |
|
150 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
151 | $ hg merge 'desc("edit end of file")' | |
|
152 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
153 | (branch merge, don't forget to commit) | |
|
154 | $ hg st | |
|
155 | M a | |
|
156 | $ [ -x a ] && echo "executable bit not removed" | |
|
157 | [1] | |
|
158 | ||
|
159 | ||
|
160 | $ cd .. | |
|
161 | ||
|
83 | 162 | Testing merging mode change with rename |
|
84 | 163 | ======================================= |
|
85 | 164 |
General Comments 0
You need to be logged in to leave comments.
Login now