[llvm-dev] Tree conflict on 'include/llvm/DebugInfo/Msf and lib/DebugInfo/Msf

Jack Howarth via llvm-dev llvm-dev at lists.llvm.org
Sat Jul 30 04:32:24 PDT 2016


 Is anyone else seeing....

Updated to revision 277264.
Summary of conflicts:
  Tree conflicts: 2
Tree conflict on 'include/llvm/DebugInfo/Msf'
   > local dir edit, incoming dir delete or move upon update
...
Tree conflict on 'lib/DebugInfo/Msf'
   > local dir edit, incoming dir delete or move upon update

in a 'svn update' on llvm trunk? Strangely these errors don't show up
on a clean check of llvm svn trunk but only on later 'svn update's of
the tree.
           Jack


More information about the llvm-dev mailing list