6   > glf = log -GT "{rev}: {desc} ({files})\n"

   390 

   391 Check that pick doesn't drop files after conflicts occur (issue6037)

   392 --------------------------------------------------------------------

   393 

   394   $ hg init issue6037

   395   $ cd issue6037

   396 

   397   $ echo apple > a

   398   $ hg ci -qAm 'apple'

   399 

   400   $ echo apricot > a

   401   $ echo banana > b

   402   $ hg ci -qAm 'apricot and banana'

   403 

   404   $ echo avocado > a

   405   $ hg ci -m 'avocado'

   406 

   407   $ hg glf

   408   @  2: avocado (a)

   409   |

   410   o  1: apricot and banana (a b)

   411   |

   412   o  0: apple (a)

   413   

   414 Now let's change order of 1 and 2 using pick command

   415 

   416   $ hg up -r 0

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

   418 

   419 We avoid merge conflict here just to make the test shorter

   420 

   421   $ hg pick -r 2 --tool :other

   422   picking 2:f08a1e4a33c4 "avocado"

   423 

   424 Now we pick revision 1 that touches two files (a and b), merge conflict is expected

   425 

   426   $ hg pick -r 1

   427   picking 1:892e123ebf62 "apricot and banana"

   428   merging a

   429   warning: conflicts while merging a! (edit, then use 'hg resolve --mark')

   430   unresolved merge conflicts (see hg help resolve)

   431   [1]

   432   $ hg resolve -t :other a

   433   (no more unresolved files)

   434   continue: hg pick --continue

   435   $ hg pick --continue

   436 

   437 Demonstrate that b was not forgotten and is definitely included in 4

   438 

   439   $ hg status b -A

   440   C b

   441   $ hg glf

   442   @  4: apricot and banana (a b)

   443   |

   444   o  3: avocado (a)

   445   |

   446   o  0: apple (a)

   447   

   448   $ cd ..