comparison tests/basic.t @ 65:030b8a638ccf

History note
author Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
date Sun, 18 Dec 2016 21:16:04 +0100
parents bbd1a915b34c
children 91efe98be062
comparison
equal deleted inserted replaced
64:bbd1a915b34c 65:030b8a638ccf
218 (branches are permanent and global, did you want a bookmark?) 218 (branches are permanent and global, did you want a bookmark?)
219 $ hg --cwd $BASE add 219 $ hg --cwd $BASE add
220 adding br1.txt 220 adding br1.txt
221 $ hg --cwd $BASE commit -m 'Br1' 221 $ hg --cwd $BASE commit -m 'Br1'
222 222
223 $ hg --cwd $BASE update default 223 Slightly tweaky way to update is to defeat mercurial 4.0 warning
224 spuriously showing up during automated tests. It used to be
225 $ hg --cwd $BASE update default
226 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
227
228 $ cd $BASE
229 $ pwd
230 /tmp/cramtests-*/basic.t/work/base (glob)
231 $ hg update default # --cwd $BASE
224 1 files updated, 0 files merged, 1 files removed, 0 files unresolved 232 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
233
225 $ cat >> $BASE/file.txt << EOF 234 $ cat >> $BASE/file.txt << EOF
226 > later text 235 > later text
227 > EOF 236 > EOF
228 $ hg --cwd $BASE commit -m 'Normal' 237 $ hg --cwd $BASE commit -m 'Normal'
229 238