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/30 16:47:18 UTC
[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
Re: [PATCH] Issue #1297 Fix - Revision 3
Posted by Philip Martin <ph...@codematters.co.uk>.
Shlomi Fish <sh...@vipe.stud.technion.ac.il> writes:
> On Wed, 30 Jul 2003, Philip Martin wrote:
>
>> At some point earlier in the copy/merge the
>> pristine text-base was retrieved from the repository.
>
> Interesting. Where?
I don't know exactly, but merge calls copy which must retrieve it.
That's where the working copy file came from after all.
>> What about the prop-base? That's just as important as the text-base.
>>
>
> Oh. How do I retrieve that as well?
I assume it is already retrieved, along with the text-base.
There is more to installing the text/prop-base than simply copying
files, for instance the text-time, prop-time and checksum fields need
to be set in the entries file. The text-base and prop-base should be
made read-only as well.
--
Philip Martin
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [PATCH] Issue #1297 Fix - Revision 3
Posted by Shlomi Fish <sh...@vipe.stud.technion.ac.il>.
On Wed, 30 Jul 2003, Philip Martin wrote:
> Shlomi Fish <sh...@vipe.stud.technion.ac.il> writes:
>
> > 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.
>
> What about keyword expansion and eol-conversion? The text-base is not
> the same as the working copy file.
Oh, OK.
> Is svn_wc_add really the right
> place to do this?
I don't know, I just work here.
> At some point earlier in the copy/merge the
> pristine text-base was retrieved from the repository.
>
Interesting. Where?
> What about the prop-base? That's just as important as the text-base.
>
Oh. How do I retrieve that as well?
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
Re: [PATCH] Issue #1297 Fix - Revision 3
Posted by Philip Martin <ph...@codematters.co.uk>.
Shlomi Fish <sh...@vipe.stud.technion.ac.il> writes:
> 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.
What about keyword expansion and eol-conversion? The text-base is not
the same as the working copy file. Is svn_wc_add really the right
place to do this? At some point earlier in the copy/merge the
pristine text-base was retrieved from the repository.
What about the prop-base? That's just as important as the text-base.
--
Philip Martin
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org