[PATCH] svn resolved
C. Michael Pilato
cmpilato at red-bean.com
Wed Oct 5 13:11:43 CDT 2011
On 10/05/2011 03:20 AM, Richard Cavell wrote:
> The book advises the user to use the svn resolved command, yet that command
> is deprecated.
Good point. Patch committed in r4105.
> While we're at it, is there any explanation as to why a property conflict is
> given a .prej extension? What does .prej stand for? And does that
> explanation need to go in the book?
.prej means "property reject" -- it's just a "p" prefix on the standard
".rej" extension generated by `patch'. And I don't think it needs explanation.
C. Michael Pilato <cmpilato at red-bean.com> | http://cmpilato.blogspot.com/
More information about the svnbook-dev