equal
deleted
inserted
replaced
303 adding file changes |
303 adding file changes |
304 added 1 changesets with 2 changes to 2 files |
304 added 1 changesets with 2 changes to 2 files |
305 new changesets 80971e65b431 |
305 new changesets 80971e65b431 |
306 updating to branch default |
306 updating to branch default |
307 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
307 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
308 $ $PYTHON mkmsg.py diffed-tip.patch msg.patch |
308 $ "$PYTHON" mkmsg.py diffed-tip.patch msg.patch |
309 $ hg --cwd b import ../msg.patch |
309 $ hg --cwd b import ../msg.patch |
310 applying ../msg.patch |
310 applying ../msg.patch |
311 $ hg --cwd b tip | grep email |
311 $ hg --cwd b tip | grep email |
312 user: email patcher |
312 user: email patcher |
313 summary: email patch |
313 summary: email patch |
369 adding file changes |
369 adding file changes |
370 added 1 changesets with 2 changes to 2 files |
370 added 1 changesets with 2 changes to 2 files |
371 new changesets 80971e65b431 |
371 new changesets 80971e65b431 |
372 updating to branch default |
372 updating to branch default |
373 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
373 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
374 $ $PYTHON mkmsg.py exported-tip.patch msg.patch |
374 $ "$PYTHON" mkmsg.py exported-tip.patch msg.patch |
375 $ cat msg.patch | hg --cwd b import - |
375 $ cat msg.patch | hg --cwd b import - |
376 applying patch from stdin |
376 applying patch from stdin |
377 $ hg --cwd b tip | grep second |
377 $ hg --cwd b tip | grep second |
378 summary: second change |
378 summary: second change |
379 $ rm -r b |
379 $ rm -r b |
401 adding file changes |
401 adding file changes |
402 added 1 changesets with 2 changes to 2 files |
402 added 1 changesets with 2 changes to 2 files |
403 new changesets 80971e65b431 |
403 new changesets 80971e65b431 |
404 updating to branch default |
404 updating to branch default |
405 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
405 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
406 $ $PYTHON mkmsg2.py diffed-tip.patch msg.patch |
406 $ "$PYTHON" mkmsg2.py diffed-tip.patch msg.patch |
407 $ cat msg.patch | hg --cwd b import - |
407 $ cat msg.patch | hg --cwd b import - |
408 applying patch from stdin |
408 applying patch from stdin |
409 $ hg --cwd b tip --template '{desc}\n' |
409 $ hg --cwd b tip --template '{desc}\n' |
410 email patch |
410 email patch |
411 |
411 |
863 Test importing a patch ending with a binary file removal |
863 Test importing a patch ending with a binary file removal |
864 |
864 |
865 $ hg init binaryremoval |
865 $ hg init binaryremoval |
866 $ cd binaryremoval |
866 $ cd binaryremoval |
867 $ echo a > a |
867 $ echo a > a |
868 $ $PYTHON -c "open('b', 'wb').write(b'a\x00b')" |
868 $ "$PYTHON" -c "open('b', 'wb').write(b'a\x00b')" |
869 $ hg ci -Am addall |
869 $ hg ci -Am addall |
870 adding a |
870 adding a |
871 adding b |
871 adding b |
872 $ hg rm a |
872 $ hg rm a |
873 $ hg rm b |
873 $ hg rm b |