Show More
@@ -133,3 +133,83 b' merge them (from the chmod side)' | |||||
133 |
|
133 | |||
134 |
|
134 | |||
135 | $ cd .. |
|
135 | $ cd .. | |
|
136 | ||||
|
137 | Testing merging mode change with rename + modification on both side | |||
|
138 | =================================================================== | |||
|
139 | ||||
|
140 | ||||
|
141 | $ hg clone base-repo rename+mod-merge-repo | |||
|
142 | updating to branch default | |||
|
143 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||
|
144 | $ cd rename+mod-merge-repo | |||
|
145 | ||||
|
146 | make "a" executable on one side | |||
|
147 | ||||
|
148 | $ chmod +x a | |||
|
149 | $ cat << EOF > a | |||
|
150 | > 1 | |||
|
151 | > x | |||
|
152 | > 3 | |||
|
153 | > 4 | |||
|
154 | > 5 | |||
|
155 | > 6 | |||
|
156 | > 7 | |||
|
157 | > 8 | |||
|
158 | > 9 | |||
|
159 | > EOF | |||
|
160 | $ hg status | |||
|
161 | M a | |||
|
162 | $ hg ci -m "make a executable, and change start" | |||
|
163 | $ [ -x a ] || echo "executable bit not recorded" | |||
|
164 | $ hg up ".^" | |||
|
165 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||
|
166 | ||||
|
167 | make "a" renamed on the other side | |||
|
168 | ||||
|
169 | $ hg mv a z | |||
|
170 | $ hg st --copies | |||
|
171 | A z | |||
|
172 | a | |||
|
173 | R a | |||
|
174 | $ cat << EOF > z | |||
|
175 | > 1 | |||
|
176 | > 2 | |||
|
177 | > 3 | |||
|
178 | > 4 | |||
|
179 | > 5 | |||
|
180 | > 6 | |||
|
181 | > 7 | |||
|
182 | > x | |||
|
183 | > 9 | |||
|
184 | > EOF | |||
|
185 | $ hg ci -m "rename a to z, and change end" | |||
|
186 | created new head | |||
|
187 | ||||
|
188 | merge them (from the rename side) | |||
|
189 | ||||
|
190 | $ hg merge 'desc("make a executable")' | |||
|
191 | merging z and a to z | |||
|
192 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |||
|
193 | (branch merge, don't forget to commit) | |||
|
194 | $ hg st --copies | |||
|
195 | M z | |||
|
196 | a | |||
|
197 | $ [ -x z ] || echo "executable bit lost" | |||
|
198 | executable bit lost | |||
|
199 | ||||
|
200 | merge them (from the chmod side) | |||
|
201 | ||||
|
202 | $ hg up -C 'desc("make a executable")' | |||
|
203 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |||
|
204 | $ hg merge 'desc("rename a to z")' | |||
|
205 | merging a and z to z | |||
|
206 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |||
|
207 | (branch merge, don't forget to commit) | |||
|
208 | $ hg st --copies | |||
|
209 | M z | |||
|
210 | a | |||
|
211 | R a | |||
|
212 | $ [ -x z ] || echo "executable bit lost" | |||
|
213 | executable bit lost | |||
|
214 | ||||
|
215 | $ cd .. |
General Comments 0
You need to be logged in to leave comments.
Login now