[svk-devel] FW: book error

[Stillwell, Jason]

also the books main page still contains a link to the old svk-dev page
and address.


________________________________

From: Stillwell, Jason 
Sent: Tuesday, August 14, 2007 12:36 PM
To: 'svk-dev at lists.openfoundry.org'
Subject: book error


http://svkbook.elixus.org/nightly/en/svk.branchmerge.copychanges.html#sv
k.branchmerge.copychanges.bestprac.merge
<http://svkbook.elixus.org/nightly/en/svk.branchmerge.copychanges.html#s
vk.branchmerge.copychanges.bestprac.merge>  
 
has 
 
" In the section called "Resolve Conflicts (Merging Others' Changes)"
<http://svkbook.elixus.org/nightly/en/svk.tour.cycle.html#svk.tour.cycle
.resolve> , we saw that an update produces files named filename.mine,
filename.rOLDREV, and filename.rNEWREV. "
 
but the linked section
(http://svkbook.elixus.org/nightly/en/svk.tour.cycle.html#svk.tour.cycle
.resolve) contains no mention of these extra files created during
conflict resolution.
 
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.bestpractical.com/pipermail/svk-devel/attachments/20070814/9bba5f0d/attachment.htm