[PATCH] Issue #1297 Fix - Rev. 5

Check:

http://t2.technion.ac.il/~shlomif/svn-patches/issue-1297-fix-rev5.patch.txt

for the patch. The log is:

<<<
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).

* include/svn_wc.h
  Added the declaration of svn_wc_put_repos_file_in_wc.

* libsvn_wc/update_editor.c
  Added the svn_wc_put_repos_file_in_wc function that puts a file
  in the working copy and set its text-base, props and prop-base.

* libsvn_client/copy.c
  Added the function put_file_helper that serves as the callback to
  put_repos_file_in_wc.
  (repos_to_wc_copy): in the file case, replaced the broken logic with
  a call to svn_wc_put_repos_file_in_wc. Also, removed setting the properties
  , which is done by put_repos as it is.
>>>

I applied the changes based on Sander Striker's commentary, so now
everything should be fine. I still want to write some tests to check if
the eol and keywords properties are correctly applied to the text base.

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
Received on Fri Aug 8 14:46:37 2003