You are viewing a plain text version of this content. The canonical link for it is here.

Posted to dev@subversion.apache.org by Shlomi Fish <sh...@vipe.stud.technion.ac.il> on 2003/07/29 14:38:29 UTC

[PATCH] Fix for Issue #1297 [was Re: Resend: Issue #1297: `svn diff' after `svn merge' that adds a file fails]

The patch is attached to this message.

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.

>>>

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

[PATCH] Fix for Issue #1297 - Rev 2 [was Re: Resend: Issue #1297: `svn diff' after `svn merge' that adds a file fails]

Posted by Shlomi Fish <sh...@vipe.stud.technion.ac.il>.

Here's an updated version of the patch that this time passes all the
tests. (I submitted the patch before running make check).

Here's the log again:

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

>>>

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