SharpSVN does not update files

Question

SvnUpdateArgs asdf = new SvnUpdateArgs(); asdf.AllowObstructions = false; asdf.Depth = SvnDepth.Infinity; asdf.IgnoreExternals = false; asdf.UpdateParents = true; asdf.Revision = SvnRevision.Head; asdf.Conflict += new EventHandler<SvnConflictEventArgs>(asdf_Conflict); asdf.Notify += new EventHandler<SvnNotifyEventArgs>(asdf_Notify); asdf.Progress += new EventHandler<SvnProgressEventArgs>(asdf_Progress); SvnUpdateResult res; client.Status(dir, new EventHandler<SvnStatusEventArgs>(Status_Hook)); if (client.Update(dir, asdf, out res)) { Console.WriteLine("Updated"); Console.WriteLine(res.Revision); Console.WriteLine(res.ResultMap); } static void asdf_Conflict(object sender, SvnConflictEventArgs e) { e.Choice = SvnAccept.TheirsFull; } 

so I see Updated , but existing files are not updated. if some files are missing, they will be downloaded. but existing files are not updated.

I'm crazy with this stuff, please help me, my hero!

Answer 1

You must set the MergedFile property. Otherwise, SharpSVN will not merge the file as you described.

 static void asdf_Conflict(object sender, SvnConflictEventArgs e) { e.Choice = SvnAccept.TheirsFull; e.MergedFile = e.TheirFile; }