[PATCH] Issue #1297 Fix - Revision 3

This time I added two automated tests to make sure this bug does not
re-occur. The repository subversion fails both tests, but the patched one
passes both.

Here's the log:

<<<
Resolves Issue #1297 ('svn diff' after 'svn merge' that adds a file fails)
and other misbehaviours. (such as svn diff after a 'svn copy' of file).

* libsvn_wc/adm_ops.c
  (svn_wc_add): if it's an addition of a copied file, then copy its
contents
  to the text-base.

* tests/clients/cmdline/copy_tests.py
  Added a test to test the Repos->WC copy of a file and then diff pattern.

* tests/clients/cmdline/merge_tests.py
  Added a test to check the merge that creates a new file and then
  diff pattern.
>>>

Regards,

        Shlomi Fish

----------------------------------------------------------------------
Shlomi Fish shlomif@vipe.technion.ac.il
Home Page: http://t2.technion.ac.il/~shlomif/

An apple a day will keep a doctor away. Two apples a day will keep two
doctors away.

        Falk Fish

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org