tests/test-rebase-conflicts.t
changeset 33139 40ee74bfa111
parent 33034 181ca34883e6
parent 33121 a5abaa81fad6
child 33332 3b7cb3d17137
equal deleted inserted replaced
33138:78fc540c53e1 33139:40ee74bfa111
   224   ignoring null merge rebase of 4
   224   ignoring null merge rebase of 4
   225   ignoring null merge rebase of 6
   225   ignoring null merge rebase of 6
   226   ignoring null merge rebase of 8
   226   ignoring null merge rebase of 8
   227   rebasing 9:e31216eec445 "more changes to f1"
   227   rebasing 9:e31216eec445 "more changes to f1"
   228    future parents are 2 and -1
   228    future parents are 2 and -1
       
   229   rebase status stored
   229    update to 2:4bc80088dc6b
   230    update to 2:4bc80088dc6b
   230   resolving manifests
   231   resolving manifests
   231    branchmerge: False, force: True, partial: False
   232    branchmerge: False, force: True, partial: False
   232    ancestor: d79e2059b5c0+, local: d79e2059b5c0+, remote: 4bc80088dc6b
   233    ancestor: d79e2059b5c0+, local: d79e2059b5c0+, remote: 4bc80088dc6b
   233    f2.txt: other deleted -> r
   234    f2.txt: other deleted -> r
   246   getting f1.txt
   247   getting f1.txt
   247   committing files:
   248   committing files:
   248   f1.txt
   249   f1.txt
   249   committing manifest
   250   committing manifest
   250   committing changelog
   251   committing changelog
       
   252   updating the branch cache
   251   rebased as 19c888675e13
   253   rebased as 19c888675e13
   252   rebasing 10:2f2496ddf49d "merge" (tip)
   254   rebasing 10:2f2496ddf49d "merge" (tip)
   253    future parents are 11 and 7
   255    future parents are 11 and 7
       
   256   rebase status stored
   254    already in destination
   257    already in destination
   255    merge against 10:2f2496ddf49d
   258    merge against 10:2f2496ddf49d
   256      detach base 9:e31216eec445
   259      detach base 9:e31216eec445
   257     searching for copies back to rev 3
   260     searching for copies back to rev 3
   258     unmatched files in other (from topological common ancestor):
   261     unmatched files in other (from topological common ancestor):
   264   getting f1.txt
   267   getting f1.txt
   265   committing files:
   268   committing files:
   266   f1.txt
   269   f1.txt
   267   committing manifest
   270   committing manifest
   268   committing changelog
   271   committing changelog
       
   272   updating the branch cache
   269   rebased as 2a7f09cac94c
   273   rebased as 2a7f09cac94c
   270   rebase merging completed
   274   rebase merging completed
   271   rebase status stored
       
   272   updating the branch cache
       
   273   update back to initial working directory parent
   275   update back to initial working directory parent
   274   resolving manifests
   276   resolving manifests
   275    branchmerge: False, force: False, partial: False
   277    branchmerge: False, force: False, partial: False
   276    ancestor: 2a7f09cac94c, local: 2a7f09cac94c+, remote: d79e2059b5c0
   278    ancestor: 2a7f09cac94c, local: 2a7f09cac94c+, remote: d79e2059b5c0
   277    f1.txt: other deleted -> r
   279    f1.txt: other deleted -> r