On Thu, 2010-05-13 at 17:10 -0500, Hyrum K. Wright wrote:
> On Thu, May 13, 2010 at 12:21 PM, Julian Foad <julian.f...@wandisco.com>wrote:
>
> > On Thu, 2010-05-13 at 12:04 -0400, Greg Stein wrote:
> > > On Thu, May 13, 2010 at 08:53, Julian Foad <julian.f...@wandisco.com>
> > wrote:
> > > >...
> > > > I was trying to do two things: avoid using plain "base" because in
> > > > traditional usage (which is still widespread) it means "WORKING_NODE if
> > > > present else BASE_NODE"; and also identify that it refers to the *text*
> > > > of the BASE_NODE rather than, say, its properties.
> > > >
> > > > Thinking about this now, "text" would be better than "pristine", so I
> > >
> > > hmm? "pristine" has a specific meaning in wc_db. Are you proposing to
> > > change that? Or is this somehow a different concept?
> >
> > "Pristine" has a specific English meaning too, which is more general
> > than the WC-NG meaning, and I'm trying to balance the two.
>
> That may be true, but we should decide what it means for Subversion, and
> then stick with that definition. Balancing multiple definitions is really
> just an exercise in semantics, and is usually more trouble than it is worth.
s/English/the-rest-of-Subversion/: "pristine" has a meaning which was
present before WC-NG and will remain entrenched in the code base and the
developers' minds. For example:
{
...
/** The actual status of the text compared to the pristine base of the
* file. This value isn't masked by other working copy statuses.
* @c pristine_text_status is #svn_wc_status_none if this value was
* not calculated during the status walk.
* @since New in 1.6
*/
enum svn_wc_status_kind pristine_text_status;
/** The actual status of the properties compared to the pristine base of
* the node. This value isn't masked by other working copy statuses.
* @c pristine_prop_status is #svn_wc_status_none if this value was
* not calculated during the status walk.
* @since New in 1.6
*/
enum svn_wc_status_kind pristine_prop_status;
} svn_wc_status2_t;
- Julian
