tests/test-revset.t
changeset 25295 701df761aa94
parent 25287 56eed3923dbc
child 25309 b333ca94403d
equal deleted inserted replaced
25293:ab618e52788a 25295:701df761aa94
    41   $ hg ci -Aqm0
    41   $ hg ci -Aqm0
    42 
    42 
    43   $ echo b > b
    43   $ echo b > b
    44   $ hg branch b
    44   $ hg branch b
    45   marked working directory as branch b
    45   marked working directory as branch b
    46   (branches are permanent and global, did you want a bookmark?)
       
    47   $ hg ci -Aqm1
    46   $ hg ci -Aqm1
    48 
    47 
    49   $ rm a
    48   $ rm a
    50   $ hg branch a-b-c-
    49   $ hg branch a-b-c-
    51   marked working directory as branch a-b-c-
    50   marked working directory as branch a-b-c-
    52   (branches are permanent and global, did you want a bookmark?)
       
    53   $ hg ci -Aqm2 -u Bob
    51   $ hg ci -Aqm2 -u Bob
    54 
    52 
    55   $ hg log -r "extra('branch', 'a-b-c-')" --template '{rev}\n'
    53   $ hg log -r "extra('branch', 'a-b-c-')" --template '{rev}\n'
    56   2
    54   2
    57   $ hg log -r "extra('branch')" --template '{rev}\n'
    55   $ hg log -r "extra('branch')" --template '{rev}\n'
    64 
    62 
    65   $ hg co 1
    63   $ hg co 1
    66   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
    64   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
    67   $ hg branch +a+b+c+
    65   $ hg branch +a+b+c+
    68   marked working directory as branch +a+b+c+
    66   marked working directory as branch +a+b+c+
    69   (branches are permanent and global, did you want a bookmark?)
       
    70   $ hg ci -Aqm3
    67   $ hg ci -Aqm3
    71 
    68 
    72   $ hg co 2  # interleave
    69   $ hg co 2  # interleave
    73   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
    70   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
    74   $ echo bb > b
    71   $ echo bb > b
    75   $ hg branch -- -a-b-c-
    72   $ hg branch -- -a-b-c-
    76   marked working directory as branch -a-b-c-
    73   marked working directory as branch -a-b-c-
    77   (branches are permanent and global, did you want a bookmark?)
       
    78   $ hg ci -Aqm4 -d "May 12 2005"
    74   $ hg ci -Aqm4 -d "May 12 2005"
    79 
    75 
    80   $ hg co 3
    76   $ hg co 3
    81   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
    77   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
    82   $ hg branch !a/b/c/
    78   $ hg branch !a/b/c/
    83   marked working directory as branch !a/b/c/
    79   marked working directory as branch !a/b/c/
    84   (branches are permanent and global, did you want a bookmark?)
       
    85   $ hg ci -Aqm"5 bug"
    80   $ hg ci -Aqm"5 bug"
    86 
    81 
    87   $ hg merge 4
    82   $ hg merge 4
    88   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
    83   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
    89   (branch merge, don't forget to commit)
    84   (branch merge, don't forget to commit)
    90   $ hg branch _a_b_c_
    85   $ hg branch _a_b_c_
    91   marked working directory as branch _a_b_c_
    86   marked working directory as branch _a_b_c_
    92   (branches are permanent and global, did you want a bookmark?)
       
    93   $ hg ci -Aqm"6 issue619"
    87   $ hg ci -Aqm"6 issue619"
    94 
    88 
    95   $ hg branch .a.b.c.
    89   $ hg branch .a.b.c.
    96   marked working directory as branch .a.b.c.
    90   marked working directory as branch .a.b.c.
    97   (branches are permanent and global, did you want a bookmark?)
       
    98   $ hg ci -Aqm7
    91   $ hg ci -Aqm7
    99 
    92 
   100   $ hg branch all
    93   $ hg branch all
   101   marked working directory as branch all
    94   marked working directory as branch all
   102   (branches are permanent and global, did you want a bookmark?)
       
   103 
    95 
   104   $ hg co 4
    96   $ hg co 4
   105   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
    97   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   106   $ hg branch é
    98   $ hg branch é
   107   marked working directory as branch \xc3\xa9 (esc)
    99   marked working directory as branch \xc3\xa9 (esc)
   108   (branches are permanent and global, did you want a bookmark?)
       
   109   $ hg ci -Aqm9
   100   $ hg ci -Aqm9
   110 
   101 
   111   $ hg tag -r6 1.0
   102   $ hg tag -r6 1.0
   112   $ hg bookmark -r6 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
   103   $ hg bookmark -r6 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
   113 
   104