llvm dev - Jul 2016 - Tree conflict on 'include/llvm/DebugInfo/Msf and lib/DebugInfo/Msf

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

Yes, when I used svn update this morning to move back to an older revision,
these appeared on my svn status although the svn status output was clean
just prior to the svn update.

-- HT

On Sat, Jul 30, 2016 at 7:32 AM, Jack Howarth via llvm-dev <
llvm-dev at lists.llvm.org> wrote:
>  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
> _______________________________________________
> LLVM Developers mailing list
> llvm-dev at lists.llvm.org
> http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-dev
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL:
<http://lists.llvm.org/pipermail/llvm-dev/attachments/20160730/39dddbcf/attachment.html>