[PATCH] - Branching and Merging

[C. Michael Pilato]

Eric,

Thanks for your kind words and for the patched XML file.

However, the original text is correct as intended.  The examples used in
that section of the book are describing a (common) scenario where the user
has checked out a working copy of only a single "branch" of the repository,
not the root of the repository.  Our intent was to show this by using
/home/user/calc-trunk -- which leaves no room to assume that other branches
and tags are part of that same working copy -- instead of
/home/user/calc/trunk, which might imply that rather /home/user/calc is the
root of a working copy that contains the trunk and perhaps other additional
lines of development.

In either case, I'm sure you noticed that the path shown here is largely
aesthetic, and has zero effect on the operations demonstrated by the
example that follows.

I'm choosing not to apply your patch, but that's not to say it wasn't
appreciated -- quite the opposite!  Thanks for reading, and for doing so in
such detail.

-- Mike

On Mon, Oct 24, 2016 at 10:41 AM, Eric Ramljak <eric at dupar.com> wrote:

> Hello,
>
>
>
> Thank you for this detailed documentation.
>
>
>
> I use SVN on a daily basis and I am always trying to learn new techniques
> and skills.
>
>
>
> SVN is a great and useful tool.
>
>
>
> While referencing this document, I found an ambiguous directory listing
> which I have updated in the attached xml document.
>
>
>
> When discussing the merging from branch to trunk, the working directory is
> incorrect. In the book it is listed as “calc-trunk” when it should be
> “calc/trunk”
>
>
>
>
>
> Again, thank you for creating this detailed document, I understand how
> tedious documentation is; this document is an excellent example of time
> well spent,
>
>
>
> Eric
> Eric Ramljak
> *Dupar Controls Inc.*
> Direct: 519.620.6231
> Fax: +1 519.624.2524
> E-mail: eric at dupar.com
>
>
>
> Legal Disclaimer: Any views expressed by the sender of this message are
> not necessarily those of Dupar Controls. Information contained in this
> e-mail may be confidential and is for the use of the intended recipient
> only, no mistake in transmission is intended to waive or compromise such
> privilege. Please advise the sender if you receive this e-mail by mistake.
>
> _______________________________________________
> svnbook-dev mailing list
> svnbook-dev at red-bean.com
> http://www.red-bean.com/mailman/listinfo/svnbook-dev
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://www.red-bean.com/pipermail/svnbook-dev/attachments/20161026/9d31ac06/attachment-0002.html>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: Grouplogosmall_e30bcd0e-e223-4aad-bd9c-8f3530328466.png
Type: image/png
Size: 3814 bytes
Desc: not available
URL: <http://www.red-bean.com/pipermail/svnbook-dev/attachments/20161026/9d31ac06/attachment-0002.png>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: DA664B15-93A3-4ea6-966B-A050CDA686AE.gif
Type: image/gif
Size: 1754 bytes
Desc: not available
URL: <http://www.red-bean.com/pipermail/svnbook-dev/attachments/20161026/9d31ac06/attachment-0004.gif>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 43858810-B7B4-4bd6-B56C-B400A08C9378.gif
Type: image/gif
Size: 1725 bytes
Desc: not available
URL: <http://www.red-bean.com/pipermail/svnbook-dev/attachments/20161026/9d31ac06/attachment-0005.gif>