Thanks for the suggestion. I did not have WinMerge so I just got the standard Builtin Diff. So I downloaded WinMerge and now I too have the choice - and yes It succeeds for me. I am not sure what I have to tell Bazaar the command line for WinMerge is - at present I just have C:\Program Files (x86)\WinMerge\WinMergeU.exe. When I select this I don't actually get the Winmerge screen - but I get a window which I assume is still Bazaar, titled External Diff. It has the following content. I used Revision 1875 - "Add a file that should have been part of my last commit".
Run command: bzr diff --using "C:\Program Files (x86)\WinMerge\Winmergeu.exe" -rrevid.kendel@[deleted].org-20120829081213-bma71kwi3dhqmtk4...
=== added file 'csharp/ICT/Petra/Shared/lib/MConference/validation/Cacheable.Validation.cs'
--- csharp/ICT/Petra/Shared/lib/MConference/validation/Cacheable.Validation.cs 1970-01-01 00 +0000
+++ csharp/ICT/Petra/Shared/lib/MConference/validation/Cacheable.Validation.cs 2012-08-29 08 +0000
@ @ -0,0 +1,80 @ @
+//
+// DO NOT REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+//
+// @[deleted]:
+// christiank
+//
+// Copyright 2004-2010 by OM International
+//
+// This file is part of OpenPetra.org.
+//
+// OpenPetra.org is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// OpenPetra.org is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with OpenPetra.org. If not, see .
+//
+using System;
+using System.Data;
+using System.Windows.Forms;
+
+using Ict.Common;
+using Ict.Common.Data;
+using Ict.Common.Verification;
+using Ict.Petra.Shared;
+using Ict.Petra.Shared.MConference.Data;
+
+namespace Ict.Petra.Shared.MConference.Validation
+{
+ ///
+ /// Contains functions for the validation of Cacheable DataTables.
+ ///
+ public static partial class TSharedValidation_CacheableDataTables
+ {
+ ///
+ /// Validates the MPartner Marital Status screen data.
+ ///
+ /// Context that describes where the data validation failed.
+ /// The which holds the the data against which the validation is run.
+ /// Will be filled with any items if
+ /// data validation errors occur.
+ /// A containing the Controls that
+ /// display data that is about to be validated.
+ public static void ValidateConferenceCostType(object AContext, PcCostTypeRow ARow,
+ ref TVerificationResultCollection AVerificationResultCollection, TValidationControlsDict AValidationControlsDict)
+ {
+ DataColumn ValidationColumn;
+ TValidationControlsData ValidationControlsData;
+ TVerificationResult VerificationResult = null;
+
+ // Don't validate deleted DataRows
+ if (ARow.RowState == DataRowState.Deleted)
+ {
+ return;
+ }
+
+ // 'UnassignableDate' must not be empty if the flag is set
+ ValidationColumn = ARow.Table.Columns;
+
+ if (AValidationControlsDict.TryGetValue(ValidationColumn, out ValidationControlsData))
+ {
+ if (ARow.UnassignableFlag)
+ {
+ VerificationResult = TDateChecks.IsNotUndefinedDateTime(ARow.UnassignableDate,
+ ValidationControlsData.ValidationControlLabel,
+ true, AContext, ValidationColumn, ValidationControlsData.ValidationControl);
+ }
+
+ // Handle addition to/removal from TVerificationResultCollection
+ AVerificationResultCollection.Auto_Add_Or_AddOrRemove(AContext, VerificationResult, ValidationColumn);
+ }
+ }
+ }
+}
\ No newline at end of file
Connected (version 2.0, client Twisted)
Authentication (publickey) successful!
Secsh channel 1 opened.
Which looks all right to me. What command do you have in the User Configuration of Bazaar for WinMerge??
