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