Policy of Keeping text-base and prop-base

[Shlomi Fish <sh...@vipe.stud.technion.ac.il>]

It seems we may not be very consistent in regard to keeping text-base and
prop-base synced inside the working copy:

1. In a "svn copy URL WC" the repos_to_wc_copy() retrieved the pristine
copy of the file using ra->get_file() but places it inside the working
copy instead of the text-base. The text-base and prop-base are not
created.

2. If we create a file and run svn add foo, there isn't a text-base for
it.

3. If I run "svn cp foo bar", we _do_ have a text-base, props and
prop-base.

So what should be our policy in regard to creating new files in the
working copy and their matching text-base and prop-base?

(This is based on a discussion I had with Ben Collins-Sussman on #svn)

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: Policy of Keeping text-base and prop-base

[Philip Martin <ph...@codematters.co.uk>]

Philip Martin <ph...@codematters.co.uk> writes:

> Shlomi Fish <sh...@vipe.stud.technion.ac.il> writes:
>
>> 1. In a "svn copy URL WC" the repos_to_wc_copy() retrieved the pristine
>> copy of the file using ra->get_file() but places it inside the working
>> copy instead of the text-base. The text-base and prop-base are not
>> created.
>
> When I try it the base files are created:
>
> $ svn cp file://`pwd`/repo/foo wc/foo3
> A  wc/foo3/bar
> Checked out revision 2.
> A         wc/foo3

Ah, I see that it's different when the URL is a file rather than a
directory; copying a file doesn't create a text or prop base.  I think
that's a bug.

-- 
Philip Martin

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

Re: Policy of Keeping text-base and prop-base

[Philip Martin <ph...@codematters.co.uk>]

Shlomi Fish <sh...@vipe.stud.technion.ac.il> writes:

> 1. In a "svn copy URL WC" the repos_to_wc_copy() retrieved the pristine
> copy of the file using ra->get_file() but places it inside the working
> copy instead of the text-base. The text-base and prop-base are not
> created.

When I try it the base files are created:

$ svn cp file://`pwd`/repo/foo wc/foo3
A  wc/foo3/bar
Checked out revision 2.
A         wc/foo3

$ svn st wc
A  +   wc/foo3

$ ls wc/foo3/.svn-prop-base wc/foo3/.svn/text-base
wc/foo3/.svn/prop-base:
bar.svn-base

wc/foo3/.svn/text-base:
bar.svn-base

> 2. If we create a file and run svn add foo, there isn't a text-base for
> it.

This is the correct behaviour.  New files don't exist in the
repository so they have no text or prop base.  (That's how it works at
the moment, I suppose it may be possible to simplify the code by
adding empty text and prop bases so that the base files always exist.)

> 3. If I run "svn cp foo bar", we _do_ have a text-base, props and
> prop-base.

This is correct.

-- 
Philip Martin

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