comparison tests/test-keyword @ 10117:98867145f4b5 stable

keyword: go into restricted mode when transplanting Expanded keyword is read into diff with transplant -b otherwise. Test this scenario. Thanks to Adam Berkes for providing an example case.
author Christian Ebert <blacktrash@gmx.net>
date Wed, 23 Dec 2009 12:04:17 +0000
parents fc493cb90bb1
children 19c3fefdaec9
comparison
equal deleted inserted replaced
10116:4b514a70ea72 10117:98867145f4b5
3 cat <<EOF >> $HGRCPATH 3 cat <<EOF >> $HGRCPATH
4 [extensions] 4 [extensions]
5 hgext.keyword = 5 hgext.keyword =
6 hgext.mq = 6 hgext.mq =
7 hgext.notify = 7 hgext.notify =
8 hgext.transplant =
8 EOF 9 EOF
9 10
10 # demo before [keyword] files are set up 11 # demo before [keyword] files are set up
11 # would succeed without uisetup otherwise 12 # would succeed without uisetup otherwise
12 echo % hg kwdemo 13 echo % hg kwdemo
335 echo % resolve to local 336 echo % resolve to local
336 HGMERGE=internal:local hg resolve -a 337 HGMERGE=internal:local hg resolve -a
337 hg commit -m localresolve 338 hg commit -m localresolve
338 cat m 339 cat m
339 340
341 echo % test restricted mode with transplant -b
342 hg update 6
343 hg branch foo
344 mv a a.bak
345 echo foobranch > a
346 cat a.bak >> a
347 rm a.bak
348 hg commit -m 9foobranch
349 hg update default
350 hg -y transplant -b foo tip
351 echo % no expansion in changeset
352 hg tip -p
353 echo % expansion in file
354 head -n 2 a
355 hg -q rollback
356 hg -q update -C
357
340 echo % switch off expansion 358 echo % switch off expansion
341 echo % kwshrink with unknown file u 359 echo % kwshrink with unknown file u
342 cp a u 360 cp a u
343 hg --verbose kwshrink 361 hg --verbose kwshrink
344 echo % cat 362 echo % cat