Conflict while using "bzr pull"

James Blackwell jblack at merconline.com
Wed Dec 14 04:29:22 GMT 2005


On Tue, Dec 13, 2005 at 12:02:50PM -0500, Aaron Bentley wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
> 
> James Blackwell wrote:
> > On Mon, Dec 12, 2005 at 09:53:28AM -0500, Aaron Bentley wrote:
> >>Perhaps "bzr revert --pristine" would delete all unversioned files as
> >>well as restoring source files to the correct names and contents.
> 
> > -1 to pristine. Though archers know it, it not in the common venacular.
> 
> If there's common vernacular, we should use it.  Otherwise, I think
> "pristine" is an accurate term, and a reasonably well-known word.

This issue is too minor for me to go into it as deeply as I have below.
However, it's already written. ;) 

I respectfully disagree on both points.  Though we can return something to
original state, we can never untouch it.  Pristine is thusly not an
appropriate word.

I suspect that you're using pristine as a synonym for pure. There is
additional meaning to pristine that does not exist for the word pure: An
impure thing can be purified and returned to a pure state. Something
pristine is not only pure, but also never touched as well. A better word
than --pristine would be --pure or, better yet, --purify

If we ignore the subtler nuances of the semantic meaning of pristine then
we are still left with a poor choice. Its not clear exactly what is going
to be pristine. 

I think better terms would be "full" or "reset", depending upon whethr you
view this as an action or a description.

bzr revert --full                  
           --reset                 Less clear, but more fun
           --wipe-local-changes    Most clear
           --purify                a verb and a word
           --pristinate            at least its a verb (that doesn't exist!)


Respectfully,
James

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20051213/11bdbf31/attachment.pgp 


More information about the bazaar mailing list