comparison tests/test-acl.t @ 15623:fc8c7a5ccc4a

merge with stable
author Matt Mackall <mpm@selenic.com>
date Thu, 08 Dec 2011 16:01:44 -0600
parents 117f9190c1ba 41885892796e
children 989f1e4f74c6
comparison
equal deleted inserted replaced
15622:86fc364ca5f8 15623:fc8c7a5ccc4a
1358 $ cd b 1358 $ cd b
1359 $ hg up 1359 $ hg up
1360 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 1360 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
1361 $ hg branch foobar 1361 $ hg branch foobar
1362 marked working directory as branch foobar 1362 marked working directory as branch foobar
1363 (branches are permanent and global, did you want a bookmark?)
1363 $ hg commit -m 'create foobar' 1364 $ hg commit -m 'create foobar'
1364 $ echo 'foo contents' > abc.txt 1365 $ echo 'foo contents' > abc.txt
1365 $ hg add abc.txt 1366 $ hg add abc.txt
1366 $ hg commit -m 'foobar contents' 1367 $ hg commit -m 'foobar contents'
1367 $ cd .. 1368 $ cd ..