equal
deleted
inserted
replaced
186 |
186 |
187 $ hg bundle --base 1 bundle.hg |
187 $ hg bundle --base 1 bundle.hg |
188 4 changesets found |
188 4 changesets found |
189 $ hg --config extensions.strip= strip -r 2 --no-backup --force -q |
189 $ hg --config extensions.strip= strip -r 2 --no-backup --force -q |
190 $ hg -R bundle.hg log --stat -T '{rev} {desc}\n' base64 2>&1 | egrep -v '^(\*\*| )' |
190 $ hg -R bundle.hg log --stat -T '{rev} {desc}\n' base64 2>&1 | egrep -v '^(\*\*| )' |
191 abort: integrity check failed on data/base64.i:2! |
191 Traceback (most recent call last): |
|
192 mercurial.mpatch.mpatchError: invalid patch |
192 |
193 |
193 $ hg bundle -R bundle.hg --base 1 bundle-again.hg -q 2>&1 | egrep -v '^(\*\*| )' |
194 $ hg bundle -R bundle.hg --base 1 bundle-again.hg -q 2>&1 | egrep -v '^(\*\*| )' |
194 Traceback (most recent call last): |
195 Traceback (most recent call last): |
195 mercurial.mpatch.mpatchError: invalid patch |
196 mercurial.mpatch.mpatchError: invalid patch |
196 $ hg -R bundle-again.hg log --stat -T '{rev} {desc}\n' base64 2>&1 | egrep -v '^(\*\*| )' |
197 $ hg -R bundle-again.hg log --stat -T '{rev} {desc}\n' base64 2>&1 | egrep -v '^(\*\*| )' |