equal
deleted
inserted
replaced
171 EOF |
171 EOF |
172 echo % incoming |
172 echo % incoming |
173 # remove path to temp dir |
173 # remove path to temp dir |
174 hg incoming | sed -e 's/^\(comparing with \).*\(test-keyword.*\)/\1\2/' |
174 hg incoming | sed -e 's/^\(comparing with \).*\(test-keyword.*\)/\1\2/' |
175 |
175 |
|
176 sed -i.bak -e 's/Id.*/& conflicttest/' a |
|
177 rm a.bak |
|
178 echo % commit conflicttest |
|
179 hg --debug commit -m'conflict?' -d '3 0' -u 'User Name <user@example.com>' |
|
180 echo % export |
|
181 hg export -o ../conflicttest.diff tip |
|
182 |
176 cd ../Test |
183 cd ../Test |
|
184 echo % import |
|
185 hg import ../conflicttest.diff |
|
186 echo % cat |
|
187 cat sym a b |
|
188 echo |
|
189 echo % rollback |
|
190 hg rollback |
|
191 echo % clean update |
|
192 hg update --clean |
|
193 |
177 echo % kwexpand/kwshrink on selected files |
194 echo % kwexpand/kwshrink on selected files |
178 mkdir x |
195 mkdir x |
179 echo % copy a x/a |
196 echo % copy a x/a |
180 hg copy a x/a |
197 hg copy a x/a |
181 echo % kwexpand a |
198 echo % kwexpand a |