equal
deleted
inserted
replaced
169 $ hg up 0 |
169 $ hg up 0 |
170 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
170 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
171 $ hg import --bypass ../patch1.diff ../patch2.diff |
171 $ hg import --bypass ../patch1.diff ../patch2.diff |
172 applying ../patch1.diff |
172 applying ../patch1.diff |
173 applying ../patch2.diff |
173 applying ../patch2.diff |
174 applied 16581080145e |
|
175 $ shortlog |
174 $ shortlog |
176 o 3:bc8ca3f8a7c4 test 0 0 - default - addf |
175 o 3:bc8ca3f8a7c4 test 0 0 - default - addf |
177 | |
176 | |
178 o 2:16581080145e test 0 0 - default - adde |
177 o 2:16581080145e test 0 0 - default - adde |
179 | |
178 | |
194 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
193 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
195 $ cd repo-multi2 |
194 $ cd repo-multi2 |
196 $ hg import --bypass --exact ../patch1.diff ../patch2.diff |
195 $ hg import --bypass --exact ../patch1.diff ../patch2.diff |
197 applying ../patch1.diff |
196 applying ../patch1.diff |
198 applying ../patch2.diff |
197 applying ../patch2.diff |
199 applied 16581080145e |
|
200 $ shortlog |
198 $ shortlog |
201 o 3:d60cb8989666 test 0 0 - foo - addf |
199 o 3:d60cb8989666 test 0 0 - foo - addf |
202 | |
200 | |
203 | o 2:16581080145e test 0 0 - default - adde |
201 | o 2:16581080145e test 0 0 - default - adde |
204 | | |
202 | | |