xdiff?

[sessh zakuto]

I am having a problem getting my .xdiff and my rag versions to merge? They are of the same date but I am getting this error..

 

 

Exception Source:      System.Xml
Exception Type:        System.Xml.XmlException
Exception Message:     An error occurred while parsing EntityName. Line 35, position 46467.
Exception Target Site: Throw

   at System.Xml.XmlTextReaderImpl.Throw(Exception e)
   at System.Xml.XmlTextReaderImpl.HandleEntityReference(Boolean isInAttributeValue, EntityExpandType expandType, Int32& charRefEndPos)
   at System.Xml.XmlTextReaderImpl.ParseAttributeValueSlow(Int32 curPos, Char quoteChar, NodeData attr)
   at System.Xml.XmlTextReaderImpl.ParseAttributes()
   at System.Xml.XmlTextReaderImpl.ParseElement()
   at System.Xml.XmlTextReaderImpl.ParseElementContent()
   at System.Xml.XmlTextReaderImpl.Read()
   at System.Xml.XmlLoader.LoadNode(Boolean skipOverWhitespace)
   at System.Xml.XmlLoader.LoadDocSequence(XmlDocument parentDoc)
   at System.Xml.XmlLoader.Load(XmlDocument doc, XmlReader reader, Boolean preserveWhitespace)
   at System.Xml.XmlDocument.Load(XmlReader reader)
   at System.Xml.XmlDocument.Load(String filename)
   at xDiffPatcher.DiffFile.Load(String fileName, DiffType type)
   at xDiffPatcher.frmMain.btnLoad_Click(Object sender, EventArgs e)
   at System.Windows.Forms.Control.OnClick(EventArgs e)
   at System.Windows.Forms.Button.OnClick(EventArgs e)
   at System.Windows.Forms.Button.OnMouseUp(MouseEventArgs mevent)
   at System.Windows.Forms.Control.WmMouseUp(Message& m, MouseButtons button, Int32 clicks)
   at System.Windows.Forms.Control.WndProc(Message& m)
   at System.Windows.Forms.ButtonBase.WndProc(Message& m)
   at System.Windows.Forms.Button.WndProc(Message& m)
   at System.Windows.Forms.Control.ControlNativeWindow.OnMessage(Message& m)
   at System.Windows.Forms.Control.ControlNativeWindow.WndProc(Message& m)
   at System.Windows.Forms.NativeWindow.Callback(IntPtr hWnd, Int32 msg, IntPtr wparam, IntPtr lparam)

Additional info:
Diff File: 08713.xdiff

Patches:

 

 

 

 

 

 

Sorry if this is in the wrong spot but thanks in advance for any help rendered..

[rayn]

Make sure you're using the latest version of xdiffpatcher, and make sure you are applying the diff to an undiffed executable.

[sessh zakuto]

Ok I will try that.. also then I use the link on that website to get my .xdiff file it just pops up in text instead of an actuall file.. so I am turning a text doc in to a .xdiff .. is that wrong? Should I just be looking for this file else where?

[rayn]

xdiff files are simple XML files.

However, you save the file directly and not open it. If you open it then save it, you might be messing up the newline characters of the file which might affect your ability to use the xdiff file.

[Sasuke Uchiha]

Try Nemo Diff