Mercurial > hg > mercurial-crew-with-dirclash
diff tests/test-simple-update.out @ 808:8f5637f0a0c0
Merge with TAH
author | mpm@selenic.com |
---|---|
date | Sat, 30 Jul 2005 08:35:29 -0800 |
parents | 122449dd89db 1f9ec150a476 |
children | 0902ffece4b4 |
line wrap: on
line diff
--- a/tests/test-simple-update.out +++ b/tests/test-simple-update.out @@ -1,6 +1,3 @@ -+ mkdir test -+ cd test -+ echo foo + hg init + hg addremove adding foo @@ -12,11 +9,8 @@ crosschecking files in changesets and ma checking files 1 files, 1 changesets, 1 total revisions + hg clone . ../branch -+ cd ../branch + hg co -+ echo bar + hg commit -m 2 -+ cd ../test + hg pull ../branch pulling from ../branch searching for changes @@ -32,7 +26,6 @@ crosschecking files in changesets and ma checking files 1 files, 2 changesets, 2 total revisions + hg co -+ cat foo foo bar + hg manifest