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 |
176 sed -i.bak -e 's/Id.*/& rejecttest/' a |
177 rm a.bak |
177 rm a.bak |
178 echo % commit conflicttest |
178 echo % commit rejecttest |
179 hg --debug commit -m'conflict?' -d '3 0' -u 'User Name <user@example.com>' |
179 hg --debug commit -m'rejects?' -d '3 0' -u 'User Name <user@example.com>' |
180 echo % export |
180 echo % export |
181 hg export -o ../conflicttest.diff tip |
181 hg export -o ../rejecttest.diff tip |
182 |
182 |
183 cd ../Test |
183 cd ../Test |
184 echo % import |
184 echo % import |
185 hg import ../conflicttest.diff |
185 hg import ../rejecttest.diff |
186 echo % cat |
186 echo % cat |
187 cat sym a b |
187 cat sym a b |
188 echo |
188 echo |
189 echo % rollback |
189 echo % rollback |
190 hg rollback |
190 hg rollback |