How do I check if conflict exists while doing an svn merge using sharpsvn?

Question

0.00/5 (No votes)

See more:

I am trying to merge different branches into the trunk branch. I want to check if a conflict exists before merging the branches. If there is a conflict with a branch that merge operation will not be carried out. How can I achieve this?

What I have tried:

I have tried this till now.

C#

SvnMergeArgs args=new SvnMergeArgs();
args.DryRun=true;
bool result=client.merge(targetPath,src_url,revision_range,args);

It is always giving me true in `result` variable but I know there is a conflict in the branch.

Posted 7-Jul-20 20:03pm

Member 14648737

Updated 7-Jul-20 20:21pm

Add a Solution

Comments

Patrice T 8-Jul-20 3:12am

What make you think that this site is support service for that product ?

1 solution

Add a Solution

Add your solution here

Treat my content as plain text, not as HTML

Preview 0

…

Existing Members

Sign in to your account

...or Join us

Download, Vote, Comment, Publish.

Your Email
Password
Forgot your password?

Your Email
This email is in use. Do you need your password?
Optional Password

I have read and agree to the Terms of Service and Privacy Policy
Please subscribe me to the CodeProject newsletters

When answering a question please:

Read the question carefully.
Understand that English isn't everyone's first language so be lenient of bad spelling and grammar.
If a question is poorly phrased then either ask for clarification, ignore it, or edit the question and fix the problem. Insults are not welcome.
Don't tell someone to read the manual. Chances are they have and don't get it. Provide an answer or move on to the next question.

Let's work to help developers, not make them feel stupid.

This content, along with any associated source code and files, is licensed under The Code Project Open License (CPOL)

Garth J Lancaster · Answer 1 · 2020-07-07T20:21:00

I think you can do this

args.Conflict += new EventHandler<SvnConflictEventArgs>(args_Conflict);

where args_Conflict is

static void args_Conflict(object sender, SvnConflictEventArgs e)
{
  // Do Something with the conflict 
  // - does this give [public enum class SvnConflictReason] for example 
}

where

402	public enum class SvnConflictReason
403	{
404		/// <summary>local edits are already present</summary>
405		Edited	= svn_wc_conflict_reason_edited,
406		/// <summary>another object is in the way</summary>
407		Obstructed = svn_wc_conflict_reason_obstructed,
408		/// <summary>object is already schedule-delete</summary>
409		Deleted = svn_wc_conflict_reason_deleted,
410		/// <summary>object is already added or schedule-add</summary>
411		Added = svn_wc_conflict_reason_added,
412		/// <summary>object is unknown or missing</summary>
413		Missing = svn_wc_conflict_reason_missing,
414		/// <summary>object is unversioned</summary>
415		NotVersioned = svn_wc_conflict_reason_unversioned
416	};

also see : c# - SharpSVN.Merge() Not Working, Returns true But not able to see changes in Code - Stack Overflow[^]