473,654 Members | 2,987 Online
Bytes | Software Development & Data Engineering Community
+ Post

Home Posts Topics Members FAQ

Using VB.NET - Nightmare with Diff Tools


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

Jun 28 '07 #1
2 1552
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.com wrote in message
news:11******** **************@ u2g2000hsc.goog legroups.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

Jun 28 '07 #2
"Egghead" <robertlo@NO_SH AW.CAwrote in news:u12PAHZuHH A.3544
@TK2MSFTNGP03.p hx.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 :-)

Jun 28 '07 #3

This thread has been closed and replies have been disabled. Please start a new discussion.

Similar topics

0
3672
by: Guillaume Lahitette | last post by:
Hello everyone, I am looking for a lightweight Java Applet to diff and merge two text files. The functionality would be a subset of what WinMerge (http://winmerge.sourceforge.net) offers: - diff 2 text files - merge (in both directions) - color coding to highlight differences I found some Java diff tools but they were all command line. And my
2
2952
by: Brian McGee | last post by:
If I have two sql server databases that started out with identical table/key/index structures, but were not properly kept in sync, is there any way I can generate a table change script to essentially 'diff' the two databases and come up with table change scripts to bring one in line with the other? An answer to this age-old question of mine would make me very happy...! Brian
1
1765
by: Luciano Cavallero | last post by:
Hi, I'm looking for a Diff utility for C++ class, able to show differences two class in term of methow, properties etc. I know that this is more complex that a common diff files because need a reverse engeneer of the source files. Do someoue know if exist a free tools that do a similar work? Thanks.
5
2611
by: Anil | last post by:
Hi, I have a HTML webpage that is updated every week. I mean the layout gets chaged every week(not a very drastic change). Like, edit box is changed to drop down menu or a field is moved from one place to other within the HTML page. I keep the HTML source backup before it gets updated. Are there any software tools(in any language) that will automatically check the difference between 2 HTML pages(2 weeks) and tell me
8
2784
by: TonyHa | last post by:
Hello, Does any one have using Python to write a Unix "diff" command for Window? Tony Ha.
2
1293
by: Paul Aspinall | last post by:
In an environment such as VS which allows great integration of the Database design components visually in the IDE, and given that a target app is will be deployed on a single machine (ie. not n-tier or client server), I'm debating the concept of using a DAL. Other than logical design, I cannot see a benefit of using it. Can anyone offer any opinions? Thanks
4
4950
by: Andreas Kasparek | last post by:
Hola! I'm preparing my master thesis about a XML Merge Tool implementation and was wondering if there is any open standard for XML diff regarding topics like: - is a diff result computed on the ordered or unordered xml node tree of the compared documents? - what identifiers/criteria should be used by default to match elements of the same type in different documents? - should a diff tool consider move operations or only insert/delete
2
2616
by: rockstar_ | last post by:
Hello all- I'm developing a Content Management software for my own site, and possibly package and deploy to other sites (for friends, family, etc.) The content management software is combined blog, photo, and site management tools. One the of the tools I would find INREDIBLY helpful is the ability to block out and syntax highlight code. I would like to be able to, as I'm writing a blog post about something I've done in Python (for...
1
3967
by: Andy Fish | last post by:
hi, I am looking for a library (i.e. not a standalone GUI program) that can do diff and merge of HTML or XML, preferably in C# or at least that can be called from C# anyone know of such a thing TIA
0
8376
marktang
by: marktang | last post by:
ONU (Optical Network Unit) is one of the key components for providing high-speed Internet services. Its primary function is to act as an endpoint device located at the user's premises. However, people are often confused as to whether an ONU can Work As a Router. In this blog post, we’ll explore What is ONU, What Is Router, ONU & Router’s main usage, and What is the difference between ONU and Router. Let’s take a closer look ! Part I. Meaning of...
0
8290
by: Hystou | last post by:
Most computers default to English, but sometimes we require a different language, especially when relocating. Forgot to request a specific language before your computer shipped? No problem! You can effortlessly switch the default language on Windows 10 without reinstalling. I'll walk you through it. First, let's disable language synchronization. With a Microsoft account, language settings sync across devices. To prevent any complications,...
0
8815
Oralloy
by: Oralloy | last post by:
Hello folks, I am unable to find appropriate documentation on the type promotion of bit-fields when using the generalised comparison operator "<=>". The problem is that using the GNU compilers, it seems that the internal comparison operator "<=>" tries to promote arguments from unsigned to signed. This is as boiled down as I can make it. Here is my compilation command: g++-12 -std=c++20 -Wnarrowing bit_field.cpp Here is the code in...
1
8489
by: Hystou | last post by:
Overview: Windows 11 and 10 have less user interface control over operating system update behaviour than previous versions of Windows. In Windows 11 and 10, there is no way to turn off the Windows Update option using the Control Panel or Settings app; it automatically checks for updates and installs any it finds, whether you like it or not. For most users, this new feature is actually very convenient. If you want to control the update process,...
0
7307
agi2029
by: agi2029 | last post by:
Let's talk about the concept of autonomous AI software engineers and no-code agents. These AIs are designed to manage the entire lifecycle of a software development project—planning, coding, testing, and deployment—without human intervention. Imagine an AI that can take a project description, break it down, write the code, debug it, and then launch it, all on its own.... Now, this would greatly impact the work of software developers. The idea...
1
6161
isladogs
by: isladogs | last post by:
The next Access Europe User Group meeting will be on Wednesday 1 May 2024 starting at 18:00 UK time (6PM UTC+1) and finishing by 19:30 (7.30PM). In this session, we are pleased to welcome a new presenter, Adolph Dupré who will be discussing some powerful techniques for using class modules. He will explain when you may want to use classes instead of User Defined Types (UDT). For example, to manage the data in unbound forms. Adolph will...
0
5622
by: conductexam | last post by:
I have .net C# application in which I am extracting data from word file and save it in database particularly. To store word all data as it is I am converting the whole word file firstly in HTML and then checking html paragraph one by one. At the time of converting from word file to html my equations which are in the word document file was convert into image. Globals.ThisAddIn.Application.ActiveDocument.Select();...
1
2716
by: 6302768590 | last post by:
Hai team i want code for transfer the data from one system to another through IP address by using C# our system has to for every 5mins then we have to update the data what the data is updated we have to send another system
1
1916
muto222
by: muto222 | last post by:
How can i add a mobile payment intergratation into php mysql website.

By using Bytes.com and it's services, you agree to our Privacy Policy and Terms of Use.

To disable or enable advertisements and analytics tracking please visit the manage ads & tracking page.