Mercurial > hg
comparison tests/test-import.out @ 10384:832f35386067
import: import each patch in a file or stream as a separate change
Supports hg export <revrange>, mail messages, and mailboxes.
Does not support multiple patches in a single MIME attachment.
Closes issue167.
| author | Brendan Cully <brendan@kublai.com> |
|---|---|
| date | Sun, 07 Feb 2010 18:06:52 +0100 |
| parents | a3d73b3e1f8a |
| children | a27af7229850 |
comparison
equal
deleted
inserted
replaced
| 10383:f83291e5643e | 10384:832f35386067 |
|---|---|
| 98 adding file changes | 98 adding file changes |
| 99 added 1 changesets with 2 changes to 2 files | 99 added 1 changesets with 2 changes to 2 files |
| 100 updating to branch default | 100 updating to branch default |
| 101 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | 101 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 102 applying patch from stdin | 102 applying patch from stdin |
| 103 % import two patches in one stream | |
| 104 applying patch from stdin | |
| 105 applied 80971e65b431 | |
| 106 1d4bd90af0e4 tip | |
| 107 1d4bd90af0e4 tip | |
| 103 % override commit message | 108 % override commit message |
| 104 requesting all changes | 109 requesting all changes |
| 105 adding changesets | 110 adding changesets |
| 106 adding manifests | 111 adding manifests |
| 107 adding file changes | 112 adding file changes |
| 174 --- | 179 --- |
| 175 % import patch1 patch2; rollback | 180 % import patch1 patch2; rollback |
| 176 parent: 0 | 181 parent: 0 |
| 177 applying ../patch1 | 182 applying ../patch1 |
| 178 applying ../patch2 | 183 applying ../patch2 |
| 184 applied 1d4bd90af0e4 | |
| 179 rolling back last transaction | 185 rolling back last transaction |
| 180 parent: 1 | 186 parent: 1 |
| 181 % hg import in a subdirectory | 187 % hg import in a subdirectory |
| 182 requesting all changes | 188 requesting all changes |
| 183 adding changesets | 189 adding changesets |