tests/test-bundle-r.out
changeset 3318 a225055b3b59
parent 3284 d89e98840b08
child 4674 723e0ddb6ada
equal deleted inserted replaced
3291:0b5d626b354e 3318:a225055b3b59
   146 4 files, 9 changesets, 7 total revisions
   146 4 files, 9 changesets, 7 total revisions
   147 rolling back last transaction
   147 rolling back last transaction
   148 % should fail
   148 % should fail
   149 abort: --base is incompatible with specifiying a destination
   149 abort: --base is incompatible with specifiying a destination
   150 abort: repository default-push not found!
   150 abort: repository default-push not found!
       
   151 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   151 % 2
   152 % 2
   152 2:d62976ca1e50
   153 2:d62976ca1e50
   153 adding changesets
   154 adding changesets
   154 abort: unknown parent ac69c658229d!
   155 abort: unknown parent ac69c658229d!
   155 transaction abort!
   156 transaction abort!
   161 adding file changes
   162 adding file changes
   162 added 6 changesets with 4 changes to 4 files (+1 heads)
   163 added 6 changesets with 4 changes to 4 files (+1 heads)
   163 (run 'hg heads' to see heads, 'hg merge' to merge)
   164 (run 'hg heads' to see heads, 'hg merge' to merge)
   164 % 8
   165 % 8
   165 8:836ac62537ab
   166 8:836ac62537ab
       
   167 checking changesets
       
   168 checking manifests
       
   169 crosschecking files in changesets and manifests
       
   170 checking files
       
   171 4 files, 9 changesets, 7 total revisions
   166 rolling back last transaction
   172 rolling back last transaction
   167 % 2
   173 % 2
   168 2:d62976ca1e50
   174 2:d62976ca1e50
   169 adding changesets
   175 adding changesets
   170 adding manifests
   176 adding manifests
   171 adding file changes
   177 adding file changes
   172 added 2 changesets with 2 changes to 2 files
   178 added 2 changesets with 2 changes to 2 files
   173 (run 'hg update' to get a working copy)
   179 (run 'hg update' to get a working copy)
   174 % 4
   180 % 4
   175 4:836ac62537ab
   181 4:836ac62537ab
   176 adding changesets
   182 checking changesets
   177 adding manifests
   183 checking manifests
   178 adding file changes
   184 crosschecking files in changesets and manifests
   179 added 4 changesets with 2 changes to 3 files (+1 heads)
   185 checking files
       
   186 2 files, 5 changesets, 5 total revisions
       
   187 rolling back last transaction
       
   188 adding changesets
       
   189 adding manifests
       
   190 adding file changes
       
   191 added 4 changesets with 3 changes to 3 files (+1 heads)
   180 (run 'hg heads' to see heads, 'hg merge' to merge)
   192 (run 'hg heads' to see heads, 'hg merge' to merge)
   181 % 8
   193 % 6
   182 8:80fe151401c2
   194 6:80fe151401c2
   183 checking changesets
   195 checking changesets
   184 checking manifests
   196 checking manifests
   185 crosschecking files in changesets and manifests
   197 crosschecking files in changesets and manifests
   186 checking files
   198 checking files
   187 4 files, 9 changesets, 7 total revisions
   199 3 files, 7 changesets, 6 total revisions
       
   200 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
       
   201 (branch merge, don't forget to commit)
       
   202 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
       
   203 adding changesets
       
   204 adding manifests
       
   205 adding file changes
       
   206 added 7 changesets with 4 changes to 4 files
       
   207 (run 'hg update' to get a working copy)
       
   208 % 9
       
   209 9:607fe5912aad
       
   210 checking changesets
       
   211 checking manifests
       
   212 crosschecking files in changesets and manifests
       
   213 checking files
       
   214 4 files, 10 changesets, 7 total revisions