equal
deleted
inserted
replaced
107 the python call below wraps continuation lines, which appear on Mac OS X 10.5 because |
107 the python call below wraps continuation lines, which appear on Mac OS X 10.5 because |
108 of the very long subject line |
108 of the very long subject line |
109 pull (minimal config) |
109 pull (minimal config) |
110 |
110 |
111 $ hg --traceback --cwd b pull ../a | \ |
111 $ hg --traceback --cwd b pull ../a | \ |
112 > python -c 'import sys,re; print re.sub("\n\t", " ", sys.stdin.read()),' |
112 > python -c 'import sys,re; print re.sub("\n[\t ]", " ", sys.stdin.read()),' |
113 pulling from ../a |
113 pulling from ../a |
114 searching for changes |
114 searching for changes |
115 adding changesets |
115 adding changesets |
116 adding manifests |
116 adding manifests |
117 adding file changes |
117 adding file changes |
133 diffs (6 lines): |
133 diffs (6 lines): |
134 |
134 |
135 diff -r cb9a9f314b8b -r 0647d048b600 a |
135 diff -r cb9a9f314b8b -r 0647d048b600 a |
136 --- a/a Thu Jan 01 00:00:00 1970 +0000 |
136 --- a/a Thu Jan 01 00:00:00 1970 +0000 |
137 +++ b/a Thu Jan 01 00:00:01 1970 +0000 |
137 +++ b/a Thu Jan 01 00:00:01 1970 +0000 |
138 @@ -1,1 +1,2 @@ |
138 @@ -1,1 +1,2 @@ a |
139 a |
|
140 +a |
139 +a |
141 (run 'hg update' to get a working copy) |
140 (run 'hg update' to get a working copy) |
142 $ cat <<EOF >> $HGRCPATH |
141 $ cat <<EOF >> $HGRCPATH |
143 > [notify] |
142 > [notify] |
144 > config = `pwd`/.notify.conf |
143 > config = `pwd`/.notify.conf |