Note that there are some explanatory texts on larger screens.

plurals
  1. POSVN Post-Commit Script Failing and causing working copy update problems
    primarykey
    data
    text
    <p>I've written a <a href="http://dl.dropbox.com/u/433257/svn-watch.pl" rel="nofollow">Perl post-commit hook</a> that sends out emails via the Perl <code>Net::SMTP</code> module. I was getting the following error when I try to do a commit:</p> <pre><code>Sending subversion/README Transmitting file data .svn: Commit failed (details follow): svn: MERGE of '/mfxcm/trunk/subversion': 200 OK (http://source) </code></pre> <p>The commit actually had worked, but the revision of my working copy wasn't updated until I did a "svn up":</p> <pre><code>$ svn commit -m"Finding what's causing commit errors. I think it's the post-commit script" Sending subversion/README Transmitting file data .svn: Commit failed (details follow): svn: MERGE of '/mfxcm/trunk/subversion': 200 OK (http://source) david@DaveBook.local:~/workspace/svn-cm-trunk/subversion $ svn up G README Updated to revision 94. </code></pre> <p>I've played around with my post-commit script. First I wrote a simple one that just prints out a simple text message just to make sure things work. Then, I used mine and exited at various times to see where the <code>MERGE</code> issue was coming from.</p> <p>I got to the point in my script where I created a new Net::SMTP object:</p> <pre><code> if ($smtpUser) { $smtp-&gt;auth( $self-&gt;SmtpUser, $self-&gt;SmtpPassword) or croak qq(Unable to connect to mailhost "@{[$self-&gt;SmtpHost]}") . qq( as user "@{[$self-&gt;SmtpUser]}"); } </code></pre> <p>If this line is enabled in my script, I get the <code>MERGE</code> issue. Otherwise, my entire script runs more or less as expected.</p> <p>I can also run the script from the command line, and everything works just fine. It's only when triggered as a post-commit hook where things fail. I've even logged in as Apache and ran the script without any problems.</p> <p>What does that MERGE error mean, and why do I get it when Subversion runs the post-commit hook?</p>
    singulars
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    plurals
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. This table or related slice is empty.
 

Querying!

 
Guidance

SQuiL has stopped working due to an internal error.

If you are curious you may find further information in the browser console, which is accessible through the devtools (F12).

Reload