comparison tests/basic.t @ 66:91efe98be062

.
author Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
date Sun, 18 Dec 2016 21:42:45 +0100
parents 030b8a638ccf
children
comparison
equal deleted inserted replaced
65:030b8a638ccf 66:91efe98be062
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 Slightly tweaky way to update is to defeat mercurial 4.0 warning 223 Filtering out warnings in command below avoids hg 4.0 warning about
224 spuriously showing up during automated tests. It used to be 224 current directory removal which for some mysterious reason shows up
225 $ hg --cwd $BASE update default 225 only during drone testing.
226 1 files updated, 0 files merged, 1 files removed, 0 files unresolved 226
227 227 $ hg --cwd $BASE update default 2>/dev/null
228 $ cd $BASE
229 $ pwd
230 /tmp/cramtests-*/basic.t/work/base (glob)
231 $ hg update default # --cwd $BASE
232 1 files updated, 0 files merged, 1 files removed, 0 files unresolved 228 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
233 229
234 $ cat >> $BASE/file.txt << EOF 230 $ cat >> $BASE/file.txt << EOF
235 > later text 231 > later text
236 > EOF 232 > EOF