Mercurial Mercurial > test / comparison
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-keyword.t
changeset 933 eb234d5d695c
parent 928 e1bf64aaef4f
child 981 0b32ba113ad2
equal deleted inserted replaced
927:95e99c4d10d3 933:eb234d5d695c 
   980 resolve to local
 
   980 resolve to local
 
   981 
   981 
   982   $ HGMERGE=internal:local hg resolve -a
 
   982   $ HGMERGE=internal:local hg resolve -a
 
   983   $ hg commit -m localresolve
 
   983   $ hg commit -m localresolve
 
   984   $ cat m
 
   984   $ cat m
 
   985   $Id: m 41efa6d38e9b Thu, 01 Jan 1970 00:00:00 +0000 test $
 
   985   $Id: m 800511b3a22d Thu, 01 Jan 1970 00:00:00 +0000 test $
 
   986   bar
 
   986   bar
 
   987 
   987 
   988 Test restricted mode with transplant -b
 
   988 Test restricted mode with transplant -b
 
   989 
   989 
   990   $ hg update 6
 
   990   $ hg update 6
 
   998   $ hg commit -m 9foobranch
 
   998   $ hg commit -m 9foobranch
 
   999   $ hg update default
 
   999   $ hg update default
 
  1000   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
  1000   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
  1001   $ hg -y transplant -b foo tip
 
  1001   $ hg -y transplant -b foo tip
 
  1002   applying 4aa30d025d50
 
  1002   applying 4aa30d025d50
 
  1003   4aa30d025d50 transplanted to 5a4da427c162
 
  1003   4aa30d025d50 transplanted to e00abbf63521
 
  1004 
  1004 
  1005 Expansion in changeset but not in file
 
  1005 Expansion in changeset but not in file
 
  1006 
  1006 
  1007   $ hg tip -p
 
  1007   $ hg tip -p
 
  1008   changeset:   11:5a4da427c162
 
  1008   changeset:   11:e00abbf63521
 
  1009   tag:         tip
 
  1009   tag:         tip
 
  1010   parent:      9:41efa6d38e9b
 
  1010   parent:      9:800511b3a22d
 
  1011   user:        test
 
  1011   user:        test
 
  1012   date:        Thu Jan 01 00:00:00 1970 +0000
 
  1012   date:        Thu Jan 01 00:00:00 1970 +0000
 
  1013   summary:     9foobranch
 
  1013   summary:     9foobranch
 
  1014   
  1014   
  1015   diff -r 41efa6d38e9b -r 5a4da427c162 a
 
  1015   diff -r 800511b3a22d -r e00abbf63521 a
 
  1016   --- a/a	Thu Jan 01 00:00:00 1970 +0000
 
  1016   --- a/a	Thu Jan 01 00:00:00 1970 +0000
 
  1017   +++ b/a	Thu Jan 01 00:00:00 1970 +0000
 
  1017   +++ b/a	Thu Jan 01 00:00:00 1970 +0000
 
  1018   @@ -1,3 +1,4 @@
 
  1018   @@ -1,3 +1,4 @@
 
  1019   +foobranch
 
  1019   +foobranch
 
  1020    expand $Id$
 
  1020    expand $Id$
 
  1021    do not process $Id:
 
  1021    do not process $Id:
 
  1022    xxx $
 
  1022    xxx $
 
  1023   
  1023   
  1024   $ head -n 2 a
 
  1024   $ head -n 2 a
 
  1025   foobranch
 
  1025   foobranch
 
  1026   expand $Id: a 5a4da427c162 Thu, 01 Jan 1970 00:00:00 +0000 test $
 
  1026   expand $Id: a e00abbf63521 Thu, 01 Jan 1970 00:00:00 +0000 test $
 
  1027 
  1027 
  1028 Turn off expansion
 
  1028 Turn off expansion
 
  1029 
  1029 
  1030   $ hg -q rollback
 
  1030   $ hg -q rollback
 
  1031   $ hg -q update -C
 
  1031   $ hg -q update -C
test