[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

RE: [PATCH] Issue #1297 Fix - Rev. 4

From: Shlomi Fish <shlomif_at_vipe.stud.technion.ac.il>
Date: 2003-08-06 16:08:20 CEST

On Wed, 6 Aug 2003, Sander Striker wrote:

> > From: Shlomi Fish [mailto:shlomif@vipe.technion.ac.il]
> > Sent: Wednesday, August 06, 2003 3:41 PM
>
> > This patch creates a valid text-base, prop-base and props.
>
> The patch looks good. +1.
>
> > 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).
> >
> > * 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 a repository and set its text-base, props and prop-base.
> ^^^^^^^^^^
>
> working copy.
>

Yeah, you're right. Corrected in:

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

Here's the log without the typo:

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

* 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
Received on Wed Aug 6 16:09:11 2003

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.