Using VB.NET - Nightmare with Diff Tools

[Phillip Taylor]

I'm having an absolute nightmare with regular diff tools which is
making it really hard to manage changes etc in CVS. Tools such as
WinMerge and ViewCVS really have really poor matching results which is
making it difficult to rollback, compare changes and don't even get me
starting on merging branches. The last one went so badly I basically
reapplied every bug fix manually to the development branch and it took
hours.

Does anyone know any diff tools (perhaps specific to VB.NET) that will
give me better results?

This is typical problem I'm getting:

ORIGINAL NEW VERSION
----------------------------------------------------------

-------------------------------- 'private sub button1_click()
-------------------------------- ' 'dosome stuff
-------- DELETED ----------- ' end sub
--------------------------------
private sub button1_click() private sub button2_click()
'do some stuff 'do some other stuff

end sub
---------------------------------

private sub button2_click() ----------------------------------
'do some other stuff
-----------------------------------

end sub end sub

I'm sure you already get the idea. (please let this format correctly!)

Any feedback / similar stories & solutions would be helpful.

Thank you

Phill

[Egghead]

Do you try the DiffMerge from source gear?
It is free, and it just compare two text files. It will not mass up your
code.
--
cheers,
RL

P.S. I do not work at source gear.

"Phillip Taylor" <Ph*****************@gmail.comwrote in message
news:11**********************@u2g2000hsc.googlegro ups.com...

>
I'm having an absolute nightmare with regular diff tools which is
making it really hard to manage changes etc in CVS. Tools such as
WinMerge and ViewCVS really have really poor matching results which is
making it difficult to rollback, compare changes and don't even get me
starting on merging branches. The last one went so badly I basically
reapplied every bug fix manually to the development branch and it took
hours.

Does anyone know any diff tools (perhaps specific to VB.NET) that will
give me better results?

This is typical problem I'm getting:

ORIGINAL NEW VERSION
----------------------------------------------------------

-------------------------------- 'private sub button1_click()
-------------------------------- ' 'dosome stuff
-------- DELETED ----------- ' end sub
--------------------------------
private sub button1_click() private sub button2_click()
'do some stuff 'do some other stuff

end sub
---------------------------------

private sub button2_click() ----------------------------------
'do some other stuff
-----------------------------------

end sub end sub

I'm sure you already get the idea. (please let this format correctly!)

Any feedback / similar stories & solutions would be helpful.

Thank you

Phill

[Spam Catcher]

"Egghead" <robertlo@NO_SHAW.CAwrote in news:u12PAHZuHHA.3544
@TK2MSFTNGP03.phx.gbl:

Do you try the DiffMerge from source gear?
It is free, and it just compare two text files. It will not mass up your
code.

I would going to suggest that one too - we use the built in version in
SourceGear's Vault client. Seems to be accurate :-)