.resx reordering causing merge nightmare.

Question

 

 I'm using c# in Visual Studio 20005, version 8.0.50727 

When I use the graphical editor to do anything I find the contents of the .rex files completely reorder, seemingly at random.

I'm using clearcase for source control,  the xml merging tool .xmldiff is taking 1 hour at >90% cpu on some files to resolve the issues, its presenting me with 1000's of changes including large numbers of unresolved changes , ( or 100's if merge as text). when I've only made a couple of minor changes to the form. Which is proving impossible to review.

Is there anyway to prevent this reordering? Or can anyone recommend a better XML merge/diff tool which integrates to clearcase.

I'd be gratefull for any suggestions on how  everyone else deals with this issue?

 

 

A separate lesser issue is that I find the designer.cs files tend to lose values, e.g. the invariantCulture parameters from tablelayout panels  

resources.ApplyResources(this.tableLayoutPanel1, "tableLayoutPanel1", System.Globalization.CultureInfo.InvariantCulture);

 

and some lines setting DataGridView values e.g.    AutoGenerateMembers

 Has any one else come across this?
Cheers

Clive

Answer 1

Hi Clive,
I just posted an article to Code Project that addresses this issue.  Here's the link: http://www.codeproject.com/KB/cs/ResxMergeUtility.aspx
Tom

Answer 2

Hi Tom,

          thank you for your response that is excellent,  and should save a us lot of pain.
  I'll give that a try immediately.
Much appreciated.
Clive

Answer 3

Hi Clive,

Feel free to contact me through Code Project if you have any additional questions.  I'd be happy to walk you through getting it working with Beyond Compare 3 (the only Merge/Diff tool I've got it working with.

Tom

Answer 4

Thanks for the article, Tom


Catherine Sea
http://www.scmsoftwareconfigurationmanagement.com

Answer 5

Thanks Tom, 
         I saw you're using Beyond compare and that BC3 has the 3 way merge/ diffs support.. 

Can see that with  Beyond compare 2/3 you can add your conversion routine in
Options
Rules
File Comparision Options
Conversions

- using your conversion routine is a vast improvement , thanks again.

Currently we're using Araxis Merge  (though also have BC2) with clearcase, via Clearaxis, I've hacked the python script and regenerated the .exe to call your routine for .resx files... so far its working ok though its early days and still finding a few different parameter conversions are necessary between clearcase and araxis.

If you don't mind me asking what SCM tool are you using BC3 with..?
 If BC3 integrates well with Clearcase then will see if we can get some licences.

Cheers
Clive

Answer 6

Hi Clive,

I work for Serena Software, so we use another product from Serena (Dimensions) for SCM.  Although it has a built in comparison tool, you can use any third party tool you like (according to the documentation).  I followed the instructions provided by Scooter Software (BC) to substitute BC for the built in tool and it works fine for both merges and comparisons.

Tom

Answer 7

My pleasure Catherine,

Tom