tests/test-branches.out
changeset 11868 062052b0d737
parent 11867 20bd477d0e89
child 11869 36a5e7cb6c8d
equal deleted inserted replaced
11867:20bd477d0e89 11868:062052b0d737
     1 marked working directory as branch a
       
     2 marked working directory as branch q
       
     3 reset working directory to branch a
       
     4 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
       
     5 marked working directory as branch b
       
     6 1 files updated, 0 files merged, 2 files removed, 0 files unresolved
       
     7 marked working directory as branch c
       
     8 abort: the name 'tip' is reserved
       
     9 abort: the name 'null' is reserved
       
    10 abort: the name '.' is reserved
       
    11 marked working directory as branch a branch name much longer than the default justification used by branches
       
    12 a branch name much longer than the default justification used by branches 7:10ff5895aa57
       
    13 b                              4:aee39cd168d0
       
    14 c                              6:589736a22561 (inactive)
       
    15 a                              5:d8cbc61dbaa6 (inactive)
       
    16 default                        0:19709c5a4e75 (inactive)
       
    17 -------
       
    18 a branch name much longer than the default justification used by branches 7:10ff5895aa57
       
    19 b                              4:aee39cd168d0
       
    20 --- Branch a
       
    21 changeset:   5:d8cbc61dbaa6
       
    22 branch:      a
       
    23 parent:      2:881fe2b92ad0
       
    24 user:        test
       
    25 date:        Thu Jan 01 00:00:04 1970 +0000
       
    26 summary:     Adding b branch head 2
       
    27 
       
    28 changeset:   2:881fe2b92ad0
       
    29 branch:      a
       
    30 user:        test
       
    31 date:        Thu Jan 01 00:00:02 1970 +0000
       
    32 summary:     Adding to a branch
       
    33 
       
    34 changeset:   1:dd6b440dd85a
       
    35 branch:      a
       
    36 user:        test
       
    37 date:        Thu Jan 01 00:00:01 1970 +0000
       
    38 summary:     Adding a branch
       
    39 
       
    40 ---- Branch b
       
    41 changeset:   4:aee39cd168d0
       
    42 branch:      b
       
    43 user:        test
       
    44 date:        Thu Jan 01 00:00:03 1970 +0000
       
    45 summary:     Adding b branch head 1
       
    46 
       
    47 changeset:   3:ac22033332d1
       
    48 branch:      b
       
    49 parent:      0:19709c5a4e75
       
    50 user:        test
       
    51 date:        Thu Jan 01 00:00:02 1970 +0000
       
    52 summary:     Adding b branch
       
    53 
       
    54 ---- going to test branch closing
       
    55 a branch name much longer than the default justification used by branches 7:10ff5895aa57
       
    56 b                              4:aee39cd168d0
       
    57 c                              6:589736a22561 (inactive)
       
    58 a                              5:d8cbc61dbaa6 (inactive)
       
    59 default                        0:19709c5a4e75 (inactive)
       
    60 2 files updated, 0 files merged, 4 files removed, 0 files unresolved
       
    61 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
       
    62 created new head
       
    63 b                             10:bfbe841b666e
       
    64 a branch name much longer than the default justification used by branches 7:10ff5895aa57
       
    65 c                              6:589736a22561 (inactive)
       
    66 a                              5:d8cbc61dbaa6 (inactive)
       
    67 default                        0:19709c5a4e75 (inactive)
       
    68 changeset:   10:bfbe841b666e
       
    69 branch:      b
       
    70 tag:         tip
       
    71 user:        test
       
    72 date:        Thu Jan 01 00:00:09 1970 +0000
       
    73 summary:     adding another cset to branch b
       
    74 
       
    75 changeset:   8:eebb944467c9
       
    76 branch:      b
       
    77 parent:      4:aee39cd168d0
       
    78 user:        test
       
    79 date:        Thu Jan 01 00:00:07 1970 +0000
       
    80 summary:     adding cset to branch b
       
    81 
       
    82 changeset:   7:10ff5895aa57
       
    83 branch:      a branch name much longer than the default justification used by branches
       
    84 user:        test
       
    85 date:        Thu Jan 01 00:00:06 1970 +0000
       
    86 summary:     Adding d branch
       
    87 
       
    88 changeset:   6:589736a22561
       
    89 branch:      c
       
    90 user:        test
       
    91 date:        Thu Jan 01 00:00:05 1970 +0000
       
    92 summary:     Adding c branch
       
    93 
       
    94 changeset:   5:d8cbc61dbaa6
       
    95 branch:      a
       
    96 parent:      2:881fe2b92ad0
       
    97 user:        test
       
    98 date:        Thu Jan 01 00:00:04 1970 +0000
       
    99 summary:     Adding b branch head 2
       
   100 
       
   101 changeset:   0:19709c5a4e75
       
   102 user:        test
       
   103 date:        Thu Jan 01 00:00:00 1970 +0000
       
   104 summary:     Adding root node
       
   105 
       
   106 changeset:   10:bfbe841b666e
       
   107 branch:      b
       
   108 tag:         tip
       
   109 user:        test
       
   110 date:        Thu Jan 01 00:00:09 1970 +0000
       
   111 summary:     adding another cset to branch b
       
   112 
       
   113 changeset:   8:eebb944467c9
       
   114 branch:      b
       
   115 parent:      4:aee39cd168d0
       
   116 user:        test
       
   117 date:        Thu Jan 01 00:00:07 1970 +0000
       
   118 summary:     adding cset to branch b
       
   119 
       
   120 changeset:   7:10ff5895aa57
       
   121 branch:      a branch name much longer than the default justification used by branches
       
   122 user:        test
       
   123 date:        Thu Jan 01 00:00:06 1970 +0000
       
   124 summary:     Adding d branch
       
   125 
       
   126 changeset:   6:589736a22561
       
   127 branch:      c
       
   128 user:        test
       
   129 date:        Thu Jan 01 00:00:05 1970 +0000
       
   130 summary:     Adding c branch
       
   131 
       
   132 changeset:   5:d8cbc61dbaa6
       
   133 branch:      a
       
   134 parent:      2:881fe2b92ad0
       
   135 user:        test
       
   136 date:        Thu Jan 01 00:00:04 1970 +0000
       
   137 summary:     Adding b branch head 2
       
   138 
       
   139 changeset:   0:19709c5a4e75
       
   140 user:        test
       
   141 date:        Thu Jan 01 00:00:00 1970 +0000
       
   142 summary:     Adding root node
       
   143 
       
   144 b                              8:eebb944467c9
       
   145 a branch name much longer than the default justification used by branches 7:10ff5895aa57
       
   146 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
       
   147 --- b branch should be inactive
       
   148 a branch name much longer than the default justification used by branches 7:10ff5895aa57
       
   149 c                              6:589736a22561 (inactive)
       
   150 a                              5:d8cbc61dbaa6 (inactive)
       
   151 default                        0:19709c5a4e75 (inactive)
       
   152 a branch name much longer than the default justification used by branches 7:10ff5895aa57
       
   153 b                             12:2da6583810df (closed)
       
   154 c                              6:589736a22561 (inactive)
       
   155 a                              5:d8cbc61dbaa6 (inactive)
       
   156 default                        0:19709c5a4e75 (inactive)
       
   157 a branch name much longer than the default justification used by branches 7:10ff5895aa57
       
   158 no open branch heads found on branches b
       
   159 changeset:   12:2da6583810df
       
   160 branch:      b
       
   161 tag:         tip
       
   162 parent:      8:eebb944467c9
       
   163 user:        test
       
   164 date:        Thu Jan 01 00:00:09 1970 +0000
       
   165 summary:     close this part branch too
       
   166 
       
   167 changeset:   11:c84627f3c15d
       
   168 branch:      b
       
   169 user:        test
       
   170 date:        Thu Jan 01 00:00:09 1970 +0000
       
   171 summary:     prune bad branch
       
   172 
       
   173 reopening closed branch head 12
       
   174 --- branch b is back in action
       
   175 b                             13:6ac12926b8c3
       
   176 a branch name much longer than the default justification used by branches 7:10ff5895aa57
       
   177 ---- test heads listings
       
   178 changeset:   13:6ac12926b8c3
       
   179 branch:      b
       
   180 tag:         tip
       
   181 user:        test
       
   182 date:        Thu Jan 01 00:00:09 1970 +0000
       
   183 summary:     reopen branch with a change
       
   184 
       
   185 changeset:   7:10ff5895aa57
       
   186 branch:      a branch name much longer than the default justification used by branches
       
   187 user:        test
       
   188 date:        Thu Jan 01 00:00:06 1970 +0000
       
   189 summary:     Adding d branch
       
   190 
       
   191 changeset:   6:589736a22561
       
   192 branch:      c
       
   193 user:        test
       
   194 date:        Thu Jan 01 00:00:05 1970 +0000
       
   195 summary:     Adding c branch
       
   196 
       
   197 changeset:   5:d8cbc61dbaa6
       
   198 branch:      a
       
   199 parent:      2:881fe2b92ad0
       
   200 user:        test
       
   201 date:        Thu Jan 01 00:00:04 1970 +0000
       
   202 summary:     Adding b branch head 2
       
   203 
       
   204 changeset:   0:19709c5a4e75
       
   205 user:        test
       
   206 date:        Thu Jan 01 00:00:00 1970 +0000
       
   207 summary:     Adding root node
       
   208 
       
   209 % branch default
       
   210 changeset:   0:19709c5a4e75
       
   211 user:        test
       
   212 date:        Thu Jan 01 00:00:00 1970 +0000
       
   213 summary:     Adding root node
       
   214 
       
   215 % branch a
       
   216 changeset:   5:d8cbc61dbaa6
       
   217 branch:      a
       
   218 parent:      2:881fe2b92ad0
       
   219 user:        test
       
   220 date:        Thu Jan 01 00:00:04 1970 +0000
       
   221 summary:     Adding b branch head 2
       
   222 
       
   223 no open branch heads found on branches a
       
   224 % branch b
       
   225 changeset:   13:6ac12926b8c3
       
   226 branch:      b
       
   227 tag:         tip
       
   228 user:        test
       
   229 date:        Thu Jan 01 00:00:09 1970 +0000
       
   230 summary:     reopen branch with a change
       
   231 
       
   232 changeset:   13:6ac12926b8c3
       
   233 branch:      b
       
   234 tag:         tip
       
   235 user:        test
       
   236 date:        Thu Jan 01 00:00:09 1970 +0000
       
   237 summary:     reopen branch with a change
       
   238 
       
   239 changeset:   11:c84627f3c15d
       
   240 branch:      b
       
   241 user:        test
       
   242 date:        Thu Jan 01 00:00:09 1970 +0000
       
   243 summary:     prune bad branch
       
   244