Follow-up to r40321:
Follow-up to r40321:

r40321 caused svn to use a wrong copyfrom path in case a directory was
copied, and then one of its children was copied. The false copyfrom points
to the source of the root of the first copy operation, rather than the
source of the copied child. If you did such a copy using a trunk client as
of r40321 or later (up to this commit), you'll need to fix copyfrom info
somehow (e.g. via dump/edit/load or by copying again from history).

* subversion/libsvn_wc/copy.c
  (determine_copyfrom_info): Restore pre-r40321 behaviour to calculate
   correct copyfrom info for copies of children of locally copied
   subdirectories. Also adjust variable names to match corresponding
   output parameter names of svn_wc__db_read_info(), for clarity.

Found by: gstein

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