svn merge using perl script

rachanakunal has asked for the wisdom of the Perl Monks concerning the following question:

This is my perl script to do svn merge.

$dir = 'D:\Transversal Unit\example\ace__project\branches\UAT';
print $dir."\n";
chdir($dir) or die "Fail $!";
$status = system("svn merge -c39,46 $sourceBranchURL");
print $status;
[download]

The problem in this is when the svn merge line is executed, the value of $status is always 0 whether there are conflicts or no. What I want is that if there are svn conflicts then I want to exit from the script and if no conflicts then further commit the code. I am not able to check for conflicts. Can anyone please help me in this?

Thanks in advance...

Comment on svn merge using perl script Download Code

Replies are listed 'Best First'.
Re: svn merge using perl script by choroba (Cardinal) on Jun 12, 2014 at 11:46 UTC
It seems svn doesn't exit with non-zero exit code on conflicts. Try to run `my $output = qx{ svn merge -c39,46 $sourceBranchURL };` [download] and parse the output for conflicts. Or, search CPAN for SVN related libraries. لսႽ† ᥲᥒ⚪⟊Ⴙᘓᖇ Ꮅᘓᖇ⎱ Ⴙᥲ𝇋ƙᘓᖇ	[reply] [d/l]