equal
deleted
inserted
replaced
174 the python call below wraps continuation lines, which appear on Mac OS X 10.5 because |
174 the python call below wraps continuation lines, which appear on Mac OS X 10.5 because |
175 of the very long subject line |
175 of the very long subject line |
176 pull (minimal config) |
176 pull (minimal config) |
177 |
177 |
178 $ hg --traceback --cwd b pull ../a | \ |
178 $ hg --traceback --cwd b pull ../a | \ |
179 > python -c 'import sys,re; print re.sub("\n[\t ]", " ", sys.stdin.read()),' |
179 > $PYTHON -c 'import sys,re; print re.sub("\n[\t ]", " ", sys.stdin.read()),' |
180 pulling from ../a |
180 pulling from ../a |
181 searching for changes |
181 searching for changes |
182 adding changesets |
182 adding changesets |
183 adding manifests |
183 adding manifests |
184 adding file changes |
184 adding file changes |
227 pull |
227 pull |
228 |
228 |
229 $ hg --cwd b rollback |
229 $ hg --cwd b rollback |
230 repository tip rolled back to revision 0 (undo pull) |
230 repository tip rolled back to revision 0 (undo pull) |
231 $ hg --traceback --cwd b pull ../a | \ |
231 $ hg --traceback --cwd b pull ../a | \ |
232 > python -c 'import sys,re; print re.sub("\n\t", " ", sys.stdin.read()),' |
232 > $PYTHON -c 'import sys,re; print re.sub("\n\t", " ", sys.stdin.read()),' |
233 pulling from ../a |
233 pulling from ../a |
234 searching for changes |
234 searching for changes |
235 adding changesets |
235 adding changesets |
236 adding manifests |
236 adding manifests |
237 adding file changes |
237 adding file changes |
271 pull |
271 pull |
272 |
272 |
273 $ hg --cwd b rollback |
273 $ hg --cwd b rollback |
274 repository tip rolled back to revision 0 (undo pull) |
274 repository tip rolled back to revision 0 (undo pull) |
275 $ hg --traceback --cwd b pull ../a | \ |
275 $ hg --traceback --cwd b pull ../a | \ |
276 > python -c 'import sys,re; print re.sub("\n\t", " ", sys.stdin.read()),' |
276 > $PYTHON -c 'import sys,re; print re.sub("\n\t", " ", sys.stdin.read()),' |
277 pulling from ../a |
277 pulling from ../a |
278 searching for changes |
278 searching for changes |
279 adding changesets |
279 adding changesets |
280 adding manifests |
280 adding manifests |
281 adding file changes |
281 adding file changes |
320 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
320 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
321 (branch merge, don't forget to commit) |
321 (branch merge, don't forget to commit) |
322 $ hg ci -m merge -d '3 0' |
322 $ hg ci -m merge -d '3 0' |
323 $ cd .. |
323 $ cd .. |
324 $ hg --traceback --cwd b pull ../a | \ |
324 $ hg --traceback --cwd b pull ../a | \ |
325 > python -c 'import sys,re; print re.sub("\n\t", " ", sys.stdin.read()),' |
325 > $PYTHON -c 'import sys,re; print re.sub("\n\t", " ", sys.stdin.read()),' |
326 pulling from ../a |
326 pulling from ../a |
327 searching for changes |
327 searching for changes |
328 adding changesets |
328 adding changesets |
329 adding manifests |
329 adding manifests |
330 adding file changes |
330 adding file changes |
376 > [notify] |
376 > [notify] |
377 > maxsubject = 4 |
377 > maxsubject = 4 |
378 > EOF |
378 > EOF |
379 $ echo a >> a/a |
379 $ echo a >> a/a |
380 $ hg --cwd a --encoding utf-8 commit -A -d '0 0' \ |
380 $ hg --cwd a --encoding utf-8 commit -A -d '0 0' \ |
381 > -m `python -c 'print "\xc3\xa0\xc3\xa1\xc3\xa2\xc3\xa3\xc3\xa4"'` |
381 > -m `$PYTHON -c 'print "\xc3\xa0\xc3\xa1\xc3\xa2\xc3\xa3\xc3\xa4"'` |
382 $ hg --traceback --cwd b --encoding utf-8 pull ../a | \ |
382 $ hg --traceback --cwd b --encoding utf-8 pull ../a | \ |
383 > python -c 'import sys,re; print re.sub("\n\t", " ", sys.stdin.read()),' |
383 > $PYTHON -c 'import sys,re; print re.sub("\n\t", " ", sys.stdin.read()),' |
384 pulling from ../a |
384 pulling from ../a |
385 searching for changes |
385 searching for changes |
386 adding changesets |
386 adding changesets |
387 adding manifests |
387 adding manifests |
388 adding file changes |
388 adding file changes |
422 > [notify] |
422 > [notify] |
423 > maxsubject = 67 |
423 > maxsubject = 67 |
424 > test = False |
424 > test = False |
425 > mbox = mbox |
425 > mbox = mbox |
426 > EOF |
426 > EOF |
427 $ python -c 'file("a/a", "ab").write("no" * 500 + "\n")' |
427 $ $PYTHON -c 'file("a/a", "ab").write("no" * 500 + "\n")' |
428 $ hg --cwd a commit -A -m "long line" |
428 $ hg --cwd a commit -A -m "long line" |
429 $ hg --traceback --cwd b pull ../a |
429 $ hg --traceback --cwd b pull ../a |
430 pulling from ../a |
430 pulling from ../a |
431 searching for changes |
431 searching for changes |
432 adding changesets |
432 adding changesets |
433 adding manifests |
433 adding manifests |
434 adding file changes |
434 adding file changes |
435 added 1 changesets with 1 changes to 1 files |
435 added 1 changesets with 1 changes to 1 files |
436 notify: sending 2 subscribers 1 changes |
436 notify: sending 2 subscribers 1 changes |
437 (run 'hg update' to get a working copy) |
437 (run 'hg update' to get a working copy) |
438 $ python -c 'import sys,re; print re.sub("\n\t", " ", file("b/mbox").read()),' |
438 $ $PYTHON -c 'import sys,re; print re.sub("\n\t", " ", file("b/mbox").read()),' |
439 From test@test.com ... ... .. ..:..:.. .... (re) |
439 From test@test.com ... ... .. ..:..:.. .... (re) |
440 Content-Type: text/plain; charset="us-ascii" |
440 Content-Type: text/plain; charset="us-ascii" |
441 MIME-Version: 1.0 |
441 MIME-Version: 1.0 |
442 Content-Transfer-Encoding: quoted-printable |
442 Content-Transfer-Encoding: quoted-printable |
443 X-Test: foo |
443 X-Test: foo |
499 marked working directory as branch test |
499 marked working directory as branch test |
500 (branches are permanent and global, did you want a bookmark?) |
500 (branches are permanent and global, did you want a bookmark?) |
501 $ echo a >> a/a |
501 $ echo a >> a/a |
502 $ hg --cwd a ci -m test -d '1 0' |
502 $ hg --cwd a ci -m test -d '1 0' |
503 $ hg --traceback --cwd b pull ../a | \ |
503 $ hg --traceback --cwd b pull ../a | \ |
504 > python -c 'import sys,re; print re.sub("\n\t", " ", sys.stdin.read()),' |
504 > $PYTHON -c 'import sys,re; print re.sub("\n\t", " ", sys.stdin.read()),' |
505 pulling from ../a |
505 pulling from ../a |
506 searching for changes |
506 searching for changes |
507 adding changesets |
507 adding changesets |
508 adding manifests |
508 adding manifests |
509 adding file changes |
509 adding file changes |
529 $ hg --cwd a update default |
529 $ hg --cwd a update default |
530 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
530 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
531 $ echo a >> a/a |
531 $ echo a >> a/a |
532 $ hg --cwd a ci -m test -d '1 0' |
532 $ hg --cwd a ci -m test -d '1 0' |
533 $ hg --traceback --cwd b pull ../a | \ |
533 $ hg --traceback --cwd b pull ../a | \ |
534 > python -c 'import sys,re; print re.sub("\n\t", " ", sys.stdin.read()),' |
534 > $PYTHON -c 'import sys,re; print re.sub("\n\t", " ", sys.stdin.read()),' |
535 pulling from ../a |
535 pulling from ../a |
536 searching for changes |
536 searching for changes |
537 adding changesets |
537 adding changesets |
538 adding manifests |
538 adding manifests |
539 adding file changes |
539 adding file changes |