<html>
<head>
<meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
</head>
<body text="#000000" bgcolor="#FFFFFF">
Joneric,<br>
<br>
Thanks for the suggestion (and sorry for the belated response). You
are correct in suggesting the use of 'svn diff --old OLD --new NEW'
for examining the differences between a pair of branches. But as I
read this section of the book again, I believe that this isn't the
right scenario for that kind of diff invocation.<br>
<br>
If you following the example from its beginning, you will see that
the user has been instructed to merge the trunk changes to his or
her branch, and that the branch working copy is, at the point that
this text appears, currently carrying those changes as local
modifications. As such, a simple 'svn diff' in that branch working
copy will reveal the changes that the text is referring to.<br>
<br>
So, yours was a great suggestion in the general sense, but not
precisely applicable to the part of the book that you propose.
Thanks, though!<br>
<br>
-- Mike<br>
<br>
<div class="moz-cite-prefix">On 07/03/2012 11:08 AM, joneric
wennerstrom wrote:<br>
</div>
<blockquote
cite="mid:1341328125.44437.YahooMailNeo@web120703.mail.ne1.yahoo.com"
type="cite">
<div style="color:#000; background-color:#fff; font-family:arial,
helvetica, sans-serif;font-size:10pt">
<div>In the "Keeping a Branch in Sync" at
<a class="moz-txt-link-freetext" href="file:///C:/rw_apps/subversion/svn-book-html/svn-book.html#svn.branchemerge.basicmerging.stayinsync">file:///C:/rw_apps/subversion/svn-book-html/svn-book.html#svn.branchemerge.basicmerging.stayinsync</a>,
there is the text</div>
<div>"At this point, the wise thing to do is look at the changes
carefully with svn diff, and then build and test your
branch." <br>
</div>
<div><br>
</div>
<div>I would suggest then providing the syntax for that, as I
have seen numerous posts regarding this.</div>
<div>svn diff --old=<url> --new=<localpath><br>
<br>
</div>
</div>
<br>
<fieldset class="mimeAttachmentHeader"></fieldset>
<br>
<pre wrap="">_______________________________________________
svnbook-dev mailing list
<a class="moz-txt-link-abbreviated" href="mailto:svnbook-dev@red-bean.com">svnbook-dev@red-bean.com</a>
<a class="moz-txt-link-freetext" href="http://www.red-bean.com/mailman/listinfo/svnbook-dev">http://www.red-bean.com/mailman/listinfo/svnbook-dev</a></pre>
</blockquote>
<br>
</body>
</html>