Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge2.out @ 632:8b8f710bb658
Provides output option to cat command
# HG changeset patch
# User thananck@yahoo.com
# Node ID c838b9c2c71b1d64b8bde786f6470b30f23962de
# Parent 7369ec5d93f2ffd490a43970edd9adf8d2bbe269
Provides output option to cat command
expand function in commands.doexport is moved to toplevel and renamed
to make_filename. The 'cat' command now accecpts --output <pattern>
switch to specify the destination file.
Index: hg/mercurial/commands.py
===================================================================
| author | thananck@yahoo.com |
|---|---|
| date | Tue, 05 Jul 2005 18:23:56 -0800 |
| parents | feadc9697b43 |
| children | 7e4843b7efd2 |
line wrap: on
line source
+ mkdir t + cd t + hg init + echo This is file a1 + hg add a + hg commit -t 'commit #0' -d '0 0' -u user + echo This is file b1 + hg add b + hg commit -t 'commit #1' -d '0 0' -u user + rm b + hg update 0 + echo This is file b2 + hg add b + hg commit -t 'commit #2' -d '0 0' -u user + cd .. + /bin/rm -rf t + mkdir t + cd t + hg init + echo This is file a1 + hg add a + hg commit -t 'commit #0' -d '0 0' -u user + echo This is file b1 + hg add b + hg commit -t 'commit #1' -d '0 0' -u user + rm b + hg update 0 + echo This is file b2 + hg commit -A -t 'commit #2' -d '0 0' -u user + cd .. + /bin/rm -rf t + mkdir t + cd t + hg init + echo This is file a1 + hg add a + hg commit -t 'commit #0' -d '0 0' -u user + echo This is file b1 + hg add b + hg commit -t 'commit #1' -d '0 0' -u user + rm b + hg remove b + hg update 0 + echo This is file b2 + hg commit -A -t 'commit #2' -d '0 0' -u user + cd .. + /bin/rm -rf t