411 

   412 

   413 Test usage of `hg resolve` in case of conflict

   414 (issue4163)

   415 

   416   $ hg init issue4163

   417   $ cd issue4163

   418   $ touch foo

   419   $ hg add foo

   420   $ cat > foo << EOF

   421   > one

   422   > two

   423   > three

   424   > four

   425   > five

   426   > six

   427   > seven

   428   > height

   429   > nine

   430   > ten

   431   > EOF

   432   $ hg ci -m 'initial'

   433   $ cat > foo << EOF

   434   > one

   435   > two

   436   > THREE

   437   > four

   438   > five

   439   > six

   440   > seven

   441   > height

   442   > nine

   443   > ten

   444   > EOF

   445   $ hg ci -m 'capital three'

   446   $ cat > foo << EOF

   447   > one

   448   > two

   449   > THREE

   450   > four

   451   > five

   452   > six

   453   > seven

   454   > height

   455   > nine

   456   > TEN

   457   > EOF

   458   $ hg ci -m 'capital ten'

   459   $ hg backout -r 'desc("capital three")' --tool internal:fail

   460   0 files updated, 0 files merged, 0 files removed, 1 files unresolved

   461   use 'hg resolve' to retry unresolved file merges

   462   [1]

   463   $ hg status

   464   $ hg resolve -l  # still unresolved

   465   U foo

   466   $ hg summary

   467   parent: 2:b71750c4b0fd tip

   468    capital ten

   469   branch: default

   470   commit: 1 unresolved (clean)

   471   update: (current)

   472   $ hg resolve --all --debug

   473   picked tool 'internal:merge' for foo (binary False symlink False)

   474   merging foo

   475   my foo@b71750c4b0fd+ other foo@a30dd8addae3 ancestor foo@913609522437

   476    premerge successful

   477   $ hg status

   478   M foo

   479   ? foo.orig

   480   $ hg resolve -l

   481   R foo

   482   $ hg summary

   483   parent: 2:b71750c4b0fd tip

   484    capital ten

   485   branch: default

   486   commit: 1 modified, 1 unknown

   487   update: (current)

   488   $ cat foo

   489   one

   490   two

   491   three

   492   four

   493   five

   494   six

   495   seven

   496   height

   497   nine

   498   TEN

   499 

   500