When running svn status for checking whether a tree is clean, skip lines starting with "X" in the output; they just indicate externals. Those lines were not present in the output before 1.7 but now cause svnmerge.py to refuse working (on trees with externals) without this change.
When running svn status for checking whether a tree is clean, skip lines
starting with "X" in the output; they just indicate externals. Those
lines were not present in the output before 1.7 but now cause svnmerge.py
to refuse working (on trees with externals) without this change.

(This script is somewhat orphaned by now, but the change was
acknowledged by Giovanni Bajo.)

* contrib/client-side/svnmerge/svnmerge.py
  (check_dir_clean): Skip lines starting with "X".

jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion