tests/test-keyword.out
changeset 668 13a6a2c0440f
parent 662 25e813ce68e2
child 669 f077a5dc5b63
equal deleted inserted replaced
667:52b03aad673b 668:13a6a2c0440f
   418 foo
   418 foo
   419 >>>>>>> other
   419 >>>>>>> other
   420 % resolve to local
   420 % resolve to local
   421 $Id: m 43dfd2854b5b Thu, 01 Jan 1970 00:00:00 +0000 test $
   421 $Id: m 43dfd2854b5b Thu, 01 Jan 1970 00:00:00 +0000 test $
   422 bar
   422 bar
       
   423 % test restricted mode with transplant -b
       
   424 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
       
   425 marked working directory as branch foo
       
   426 created new head
       
   427 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
       
   428 applying 1c4378f51c4d
       
   429 1c4378f51c4d transplanted to 7d855abcab87
       
   430 % no expansion in changeset
       
   431 changeset:   11:7d855abcab87
       
   432 tag:         tip
       
   433 parent:      9:43dfd2854b5b
       
   434 user:        test
       
   435 date:        Thu Jan 01 00:00:00 1970 +0000
       
   436 summary:     9foobranch
       
   437 
       
   438 diff -r 43dfd2854b5b -r 7d855abcab87 a
       
   439 --- a/a	Thu Jan 01 00:00:00 1970 +0000
       
   440 +++ b/a	Thu Jan 01 00:00:00 1970 +0000
       
   441 @@ -1,3 +1,4 @@
       
   442 +foobranch
       
   443  expand $Id$
       
   444  do not process $Id:
       
   445  xxx $
       
   446 
       
   447 % expansion in file
       
   448 foobranch
       
   449 expand $Id: a 7d855abcab87 Thu, 01 Jan 1970 00:00:00 +0000 test $
   423 % switch off expansion
   450 % switch off expansion
   424 % kwshrink with unknown file u
   451 % kwshrink with unknown file u
   425 overwriting a shrinking keywords
   452 overwriting a shrinking keywords
   426 overwriting m shrinking keywords
   453 overwriting m shrinking keywords
   427 overwriting x/a shrinking keywords
   454 overwriting x/a shrinking keywords