<html>
<head>
<base href="https://wiki.asterisk.org/wiki">
<link rel="stylesheet" href="/wiki/s/en/2176/25/9/_/styles/combined.css?spaceKey=AST&forWysiwyg=true" type="text/css">
</head>
<body style="background: white;" bgcolor="white" class="email-body">
<div id="pageContent">
<div id="notificationFormat">
<div class="wiki-content">
<div class="email">
<h2><a href="https://wiki.asterisk.org/wiki/display/AST/Subversion+Usage?focusedCommentId=21463804#comment-21463804">Subversion Usage</a></h2>
<h4>Page
<b>comment added</b> by <a href="https://wiki.asterisk.org/wiki/display/~lathama">Andrew Latham</a>
</h4>
<br/>
<div class="notificationGreySide">
<p>It was there the whole time, I was typing report and hitting tab... I put down the laptop for a few hours, thanks. <img class="emoticon" src="/wiki/images/icons/emoticons/biggrin.gif" height="20" width="20" align="absmiddle" alt="" border="0"/></p>
</div>
<div style="border-bottom: 1px solid #ddd; padding: 10px 20px 7px 20px;">
<strong>In reply to a comment by <a href="/wiki/display/~mjordan"
class="url fn confluence-userlink" data-username="mjordan"
>Matt Jordan</a>:</strong><br/>
<p>Its part of mergetool, which wraps around svnmerge. Example:</p>
<div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
<script type="syntaxhighlighter" class="theme: Confluence; brush: java; gutter: false"><![CDATA[$ record810 345738
spawn /usr/local/bin/svnmerge.real merge --record-only -P branch-1.8-merged -B branch-1.8-blocked -f ../merge.msg -r 345738]]></script>
</div></div>
</div>
<div id="commentsSection" class="wiki-content pageSection">
<div style="float: right;" class="grey">
<a href="https://wiki.asterisk.org/wiki/users/removespacenotification.action?spaceKey=AST">Stop watching space</a>
<span style="padding: 0px 5px;">|</span>
<a href="https://wiki.asterisk.org/wiki/users/editmyemailsettings.action">Change email notification preferences</a>
</div>
<a href="https://wiki.asterisk.org/wiki/display/AST/Subversion+Usage?focusedCommentId=21463804#comment-21463804">View Online</a>
|
<a id="reply-21463804" href="https://wiki.asterisk.org/wiki/display/AST/Subversion+Usage?replyToComment=21463804#comment-21463804">Reply To This</a>
</div>
</div>
</div>
</div>
</div>
</body>
</html>