equal
deleted
inserted
replaced
198 |
198 |
199 fail for config file is missing |
199 fail for config file is missing |
200 |
200 |
201 $ hg --cwd b rollback |
201 $ hg --cwd b rollback |
202 repository tip rolled back to revision 0 (undo pull) |
202 repository tip rolled back to revision 0 (undo pull) |
203 working directory now based on revision 0 |
|
204 $ hg --cwd b pull ../a 2>&1 | grep 'error.*\.notify\.conf' > /dev/null && echo pull failed |
203 $ hg --cwd b pull ../a 2>&1 | grep 'error.*\.notify\.conf' > /dev/null && echo pull failed |
205 pull failed |
204 pull failed |
206 $ touch ".notify.conf" |
205 $ touch ".notify.conf" |
207 |
206 |
208 pull |
207 pull |
209 |
208 |
210 $ hg --cwd b rollback |
209 $ hg --cwd b rollback |
211 repository tip rolled back to revision 0 (undo pull) |
210 repository tip rolled back to revision 0 (undo pull) |
212 working directory now based on revision 0 |
|
213 $ hg --traceback --cwd b pull ../a | \ |
211 $ hg --traceback --cwd b pull ../a | \ |
214 > python -c 'import sys,re; print re.sub("\n\t", " ", sys.stdin.read()),' |
212 > python -c 'import sys,re; print re.sub("\n\t", " ", sys.stdin.read()),' |
215 pulling from ../a |
213 pulling from ../a |
216 searching for changes |
214 searching for changes |
217 adding changesets |
215 adding changesets |
252 |
250 |
253 pull |
251 pull |
254 |
252 |
255 $ hg --cwd b rollback |
253 $ hg --cwd b rollback |
256 repository tip rolled back to revision 0 (undo pull) |
254 repository tip rolled back to revision 0 (undo pull) |
257 working directory now based on revision 0 |
|
258 $ hg --traceback --cwd b pull ../a | \ |
255 $ hg --traceback --cwd b pull ../a | \ |
259 > python -c 'import sys,re; print re.sub("\n\t", " ", sys.stdin.read()),' |
256 > python -c 'import sys,re; print re.sub("\n\t", " ", sys.stdin.read()),' |
260 pulling from ../a |
257 pulling from ../a |
261 searching for changes |
258 searching for changes |
262 adding changesets |
259 adding changesets |