tests/test-rebase-conflicts.t
changeset 32267 c2380b448265
parent 32249 27e67cfea27f
child 32268 24f55686a63d
equal deleted inserted replaced
32266:2b6692df1bdf 32267:c2380b448265
   266   committing manifest
   266   committing manifest
   267   committing changelog
   267   committing changelog
   268   rebased as 2a7f09cac94c
   268   rebased as 2a7f09cac94c
   269   rebase merging completed
   269   rebase merging completed
   270   rebase status stored
   270   rebase status stored
       
   271   updating the branch cache
   271   update back to initial working directory parent
   272   update back to initial working directory parent
   272   resolving manifests
   273   resolving manifests
   273    branchmerge: False, force: False, partial: False
   274    branchmerge: False, force: False, partial: False
   274    ancestor: 2a7f09cac94c, local: 2a7f09cac94c+, remote: d79e2059b5c0
   275    ancestor: 2a7f09cac94c, local: 2a7f09cac94c+, remote: d79e2059b5c0
   275    f1.txt: other deleted -> r
   276    f1.txt: other deleted -> r
   301   adding file changes
   302   adding file changes
   302   adding f1.txt revisions
   303   adding f1.txt revisions
   303   added 2 changesets with 2 changes to 1 files
   304   added 2 changesets with 2 changes to 1 files
   304   bundle2-input-part: total payload size 1686
   305   bundle2-input-part: total payload size 1686
   305   bundle2-input-bundle: 0 parts total
   306   bundle2-input-bundle: 0 parts total
       
   307   updating the branch cache
   306   invalid branchheads cache (served): tip differs
   308   invalid branchheads cache (served): tip differs
   307   history modification detected - truncating revision branch cache to revision 9
   309   history modification detected - truncating revision branch cache to revision 9
   308   rebase completed
   310   rebase completed
   309   truncating cache/rbc-revs-v1 to 72
   311   truncating cache/rbc-revs-v1 to 72
   310 
   312