tests/test-convert-hg-sink.t
changeset 42360 78530404d00b
parent 38769 7e023ce26c7f
child 42361 c0e1ea0c4cee
equal deleted inserted replaced
42359:832c59d1196e 42360:78530404d00b
   571   0 f
   571   0 f
   572   $ hg -R a status --change tip
   572   $ hg -R a status --change tip
   573   M f
   573   M f
   574   A b-only
   574   A b-only
   575   R a-only
   575   R a-only
       
   576 
       
   577 Recorded {files} list does not get confused about flags on merge commits
       
   578 
       
   579 #if execbit
       
   580   $ cd ..
       
   581   $ hg init merge-flags-orig
       
   582   $ cd merge-flags-orig
       
   583   $ echo 0 > 0
       
   584   $ hg ci -Aqm 'add 0'
       
   585   $ echo a > a
       
   586   $ chmod +x a
       
   587   $ hg ci -qAm 'add executable file'
       
   588   $ hg co -q 0
       
   589   $ echo b > b
       
   590   $ hg ci -qAm 'add file'
       
   591   $ hg merge -q
       
   592   $ hg ci -m 'merge'
       
   593   $ hg log -G -T '{rev} {desc}\n'
       
   594   @    3 merge
       
   595   |\
       
   596   | o  2 add file
       
   597   | |
       
   598   o |  1 add executable file
       
   599   |/
       
   600   o  0 add 0
       
   601   
       
   602 
       
   603 # No files changed
       
   604   $ hg log -r 3 -T '{files}\n'
       
   605   
       
   606 
       
   607   $ cd ..
       
   608   $ hg convert merge-flags-orig merge-flags-new -q
       
   609   $ cd merge-flags-new
       
   610   $ hg log -G -T '{rev} {desc}\n'
       
   611   o    3 merge
       
   612   |\
       
   613   | o  2 add file
       
   614   | |
       
   615   o |  1 add executable file
       
   616   |/
       
   617   o  0 add 0
       
   618   
       
   619 BROKEN: now 'a' appears changed
       
   620   $ hg log -r 3 -T '{files}\n'
       
   621   a
       
   622 
       
   623 #endif