Mercurial > hg

comparison tests/test-import.out @ 6001:30d2fecaab76

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with crew-stable
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Sun, 03 Feb 2008 21:47:07 -0200
parents e7f1be4bf40a a732eebf1958
children 36ab165abbe2
comparison
equal deleted inserted replaced
6000:8e7d64989bb8 6001:30d2fecaab76
150 applying patch from stdin 150 applying patch from stdin
151 email patch 151 email patch
152 152
153 next line 153 next line
154 --- 154 ---
155 % import patch1 patch2; rollback
156 parent: 0
157 applying ../patch1
158 applying ../patch2
159 rolling back last transaction
160 parent: 1
155 % hg import in a subdirectory 161 % hg import in a subdirectory
156 requesting all changes 162 requesting all changes
157 adding changesets 163 adding changesets
158 adding manifests 164 adding manifests
159 adding file changes 165 adding file changes