Off topic: Source merge tools

I know this is kind of off topic for this list, but I hope you’ll indulge
me this one time.

Does anyone have a recomendation for a good source merge tool? Pretty soon,
I’m going to have to merge a ton of changes done by someone else into the
main line development branch of our product. I’d really like to do it with
a decent merge tool, but I don’t know of any.

Thanks for your help
Dan


You are currently subscribed to ntdev as: $subst(‘Recip.EmailAddr’)
To unsubscribe send a blank email to leave-ntdev-$subst(‘Recip.MemberIDChar’)@lists.osr.com

CVS?

-----Original Message-----
From: xxxxx@giganet.com [mailto:xxxxx@giganet.com]
Sent: Sunday, February 11, 2001 8:00 PM
To: NT Developers Interest List
Subject: [ntdev] Off topic: Source merge tools

I know this is kind of off topic for this list, but I hope you’ll indulge
me this one time.

Does anyone have a recomendation for a good source merge tool?


You are currently subscribed to ntdev as: $subst(‘Recip.EmailAddr’)
To unsubscribe send a blank email to leave-ntdev-$subst(‘Recip.MemberIDChar’)@lists.osr.com

Dan-

I’ve been using SlickEdit as an IDE under Linux for a few
years and particularly like its diff/merge tools. MicroEdge has
versions for all platforms including Win32. Aint cheap though,
but compared to Micro$oft stuff maybe $295 isnt so bad.

Anyway you can get a 30-day eval free… maybe you can
finish the merge by then? :wink:

www.slickedit.com



-Bob Kennett

xxxxx@giganet.com wrote:

> I know this is kind of off topic for this list, but I hope you’ll indulge
> me this one time.
>
> Does anyone have a recomendation for a good source merge tool? Pretty soon,
> I’m going to have to merge a ton of changes done by someone else into the
> main line development branch of our product. I’d really like to do it with
> a decent merge tool, but I don’t know of any.
>
> Thanks for your help
> Dan


You are currently subscribed to ntdev as: $subst(‘Recip.EmailAddr’)
To unsubscribe send a blank email to leave-ntdev-$subst(‘Recip.MemberIDChar’)@lists.osr.com

What do you guys think of Windiff ? It’s visual and it probably can’t be
automated, but I’ve used it to merge sources without much hassle. I ran two
copies of Notepad or Wordpad, driven from Windiff, so that you can control
how much merging you do by rerunning the diff.

Alberto.

-----Original Message-----
From: Robert Kennett [mailto:xxxxx@sequest.com]
Sent: Monday, February 12, 2001 5:34 PM
To: NT Developers Interest List
Subject: [ntdev] Re: Off topic: Source merge tools

Dan-

I’ve been using SlickEdit as an IDE under Linux for a few
years and particularly like its diff/merge tools. MicroEdge has
versions for all platforms including Win32. Aint cheap though,
but compared to Micro$oft stuff maybe $295 isnt so bad.

Anyway you can get a 30-day eval free… maybe you can
finish the merge by then? :wink:

www.slickedit.com



-Bob Kennett

xxxxx@giganet.com wrote:

> I know this is kind of off topic for this list, but I hope you’ll indulge
> me this one time.
>
> Does anyone have a recomendation for a good source merge tool? Pretty
soon,
> I’m going to have to merge a ton of changes done by someone else into the
> main line development branch of our product. I’d really like to do it with
> a decent merge tool, but I don’t know of any.
>
> Thanks for your help
> Dan


You are currently subscribed to ntdev as: xxxxx@compuware.com
To unsubscribe send a blank email to leave-ntdev-$subst(‘Recip.MemberIDChar’)@lists.osr.com


You are currently subscribed to ntdev as: $subst(‘Recip.EmailAddr’)
To unsubscribe send a blank email to leave-ntdev-$subst(‘Recip.MemberIDChar’)@lists.osr.com

Try Beyond Compare utility at http://www.scootersoftware.com/. It is a
directory comparison utility with very good file viewer which can be used as
merge tool.

Best regards,

Michal Vodicka
Veridicom
(RKK - Skytale)
[WWW: http://www.veridicom.com , http://www.skytale.com]


From: xxxxx@giganet.com[SMTP:xxxxx@giganet.com]
Reply To: NT Developers Interest List
Sent: Monday, February 12, 2001 2:00 AM
To: NT Developers Interest List
Subject: [ntdev] Off topic: Source merge tools

I know this is kind of off topic for this list, but I hope you’ll indulge
me this one time.

Does anyone have a recomendation for a good source merge tool? Pretty
soon,
I’m going to have to merge a ton of changes done by someone else into the
main line development branch of our product. I’d really like to do it with

a decent merge tool, but I don’t know of any.

Thanks for your help
Dan


You are currently subscribed to ntdev as: xxxxx@rkk.cz
To unsubscribe send a blank email to leave-ntdev-$subst(‘Recip.MemberIDChar’)@lists.osr.com


You are currently subscribed to ntdev as: $subst(‘Recip.EmailAddr’)
To unsubscribe send a blank email to leave-ntdev-$subst(‘Recip.MemberIDChar’)@lists.osr.com

Yes… DiffZilla which comes with Visual SlickEdit.

It is one of the best diffing/merging programs I have ever used.

You can download a 15 day trial copy of VS (which includes DiffZilla) from http://www.slickedit.com/

Rick Howard
Ontrack Data International

-----Original Message-----
From: xxxxx@giganet.com [mailto:xxxxx@giganet.com]
Sent: Sunday, February 11, 2001 6:00 PM
To: NT Developers Interest List
Subject: [ntdev] Off topic: Source merge tools

I know this is kind of off topic for this list, but I hope you’ll indulge
me this one time.

Does anyone have a recomendation for a good source merge tool? Pretty soon,
I’m going to have to merge a ton of changes done by someone else into the
main line development branch of our product. I’d really like to do it with
a decent merge tool, but I don’t know of any.

Thanks for your help
Dan


You are currently subscribed to ntdev as: xxxxx@ontrack.com
To unsubscribe send a blank email to leave-ntdev-$subst(‘Recip.MemberIDChar’)@lists.osr.com


You are currently subscribed to ntdev as: $subst(‘Recip.EmailAddr’)
To unsubscribe send a blank email to leave-ntdev-$subst(‘Recip.MemberIDChar’)@lists.osr.com

You may also try our (Starbase’s) VisDiff/VisMerge utilities that come in
StarTeam Client package.
You can download a trial version from our web site: www.starbase.com
(Products->Download->StarTeam->Try StarTeam over the Internet)

Is it an advertisement or what? :wink:

Regards,

Vladimir

-----Original Message-----
From: xxxxx@giganet.com [mailto:xxxxx@giganet.com]
Sent: Sunday, February 11, 2001 5:00 PM
To: NT Developers Interest List
Subject: [ntdev] Off topic: Source merge tools

I know this is kind of off topic for this list, but I hope you’ll indulge
me this one time.

Does anyone have a recomendation for a good source merge tool? Pretty soon,
I’m going to have to merge a ton of changes done by someone else into the
main line development branch of our product. I’d really like to do it with
a decent merge tool, but I don’t know of any.

Thanks for your help
Dan


You are currently subscribed to ntdev as: xxxxx@Starbase.com
To unsubscribe send a blank email to leave-ntdev-$subst(‘Recip.MemberIDChar’)@lists.osr.com


You are currently subscribed to ntdev as: $subst(‘Recip.EmailAddr’)
To unsubscribe send a blank email to leave-ntdev-$subst(‘Recip.MemberIDChar’)@lists.osr.com

Visit www.araxis.com

There merge 2000 tool does an excellent job when merging files and can even
do 3 files side by side merge/ compare.

Robert Fernando
www.rowanclose.tzo.com
www.bigfoot.com/~robert.fernando
Fax +44(0)870-133-1992

----- Original Message -----
From:
To: “NT Developers Interest List”
Sent: Monday, February 12, 2001 5:00 PM
Subject: [ntdev] Off topic: Source merge tools

> I know this is kind of off topic for this list, but I hope you’ll indulge
> me this one time.
>
> Does anyone have a recomendation for a good source merge tool? Pretty
soon,
> I’m going to have to merge a ton of changes done by someone else into the
> main line development branch of our product. I’d really like to do it with
> a decent merge tool, but I don’t know of any.
>
> Thanks for your help
> Dan
>
> —
> You are currently subscribed to ntdev as: xxxxx@bigfoot.com
> To unsubscribe send a blank email to leave-ntdev-$subst(‘Recip.MemberIDChar’)@lists.osr.com
>


You are currently subscribed to ntdev as: $subst(‘Recip.EmailAddr’)
To unsubscribe send a blank email to leave-ntdev-$subst(‘Recip.MemberIDChar’)@lists.osr.com

CVS with ExamDiff Pro by PrestoSoft can be used.
ExamDiff Pro allows copying of text from one file to another in the file
comparison panes via drag and drop or a hotkey.


Get Your Private, Free E-mail from MSN Hotmail at http://www.hotmail.com.


You are currently subscribed to ntdev as: $subst(‘Recip.EmailAddr’)
To unsubscribe send a blank email to leave-ntdev-$subst(‘Recip.MemberIDChar’)@lists.osr.com

Hello,

a very good and simple tool is beyond compare !!!
www.scootersoftware.com
After 5 minutes use I have buyed immediatly. Forget all MS DIFF, MKSSI

elli


You are currently subscribed to ntdev as: $subst(‘Recip.EmailAddr’)
To unsubscribe send a blank email to leave-ntdev-$subst(‘Recip.MemberIDChar’)@lists.osr.com

I think that you have stepped into a bit of a religious war, but I have to
throw my 2 cents in. Visual Slickedit is not only a great editor but its
Diffzilla differencing engine really does a great job. It does not get
easily confused when files are quite different like Windiff or SourceSafe.

Sean O’Connor
Spectra Logic
Boulder, CO

-----Original Message-----
From: xxxxx@giganet.com [mailto:xxxxx@giganet.com]
Sent: Sunday, February 11, 2001 6:00 PM
To: NT Developers Interest List
Subject: [ntdev] Off topic: Source merge tools

I know this is kind of off topic for this list, but I hope you’ll indulge
me this one time.

Does anyone have a recomendation for a good source merge tool? Pretty soon,
I’m going to have to merge a ton of changes done by someone else into the
main line development branch of our product. I’d really like to do it with
a decent merge tool, but I don’t know of any.

Thanks for your help
Dan


You are currently subscribed to ntdev as: xxxxx@spectralogic.com
To unsubscribe send a blank email to leave-ntdev-$subst(‘Recip.MemberIDChar’)@lists.osr.com


You are currently subscribed to ntdev as: $subst(‘Recip.EmailAddr’)
To unsubscribe send a blank email to leave-ntdev-$subst(‘Recip.MemberIDChar’)@lists.osr.com

Thanks to Robert and Andrew Kirilenko. I downloaded a trial copy of this and
it works GREAT!

Dan

-----Original Message-----
From: xxxxx@lists.osr.com
[mailto:xxxxx@lists.osr.com]On Behalf Of Robert Fernando
-ntlworld
Sent: Monday, February 12, 2001 6:37 PM
To: NT Developers Interest List
Subject: [ntdev] Re: Off topic: Source merge tools

Visit www.araxis.com

There merge 2000 tool does an excellent job when merging files and can even
do 3 files side by side merge/ compare.

Robert Fernando
www.rowanclose.tzo.com
www.bigfoot.com/~robert.fernando
Fax +44(0)870-133-1992

----- Original Message -----
From:
To: “NT Developers Interest List”
Sent: Monday, February 12, 2001 5:00 PM
Subject: [ntdev] Off topic: Source merge tools

> I know this is kind of off topic for this list, but I hope you’ll indulge
> me this one time.
>
> Does anyone have a recomendation for a good source merge tool? Pretty
soon,
> I’m going to have to merge a ton of changes done by someone else into the
> main line development branch of our product. I’d really like to do it with
> a decent merge tool, but I don’t know of any.
>
> Thanks for your help
> Dan
>
> —
> You are currently subscribed to ntdev as: xxxxx@bigfoot.com
> To unsubscribe send a blank email to leave-ntdev-$subst(‘Recip.MemberIDChar’)@lists.osr.com
>


You are currently subscribed to ntdev as: xxxxx@giganet.com
To unsubscribe send a blank email to leave-ntdev-$subst(‘Recip.MemberIDChar’)@lists.osr.com


You are currently subscribed to ntdev as: $subst(‘Recip.EmailAddr’)
To unsubscribe send a blank email to leave-ntdev-$subst(‘Recip.MemberIDChar’)@lists.osr.com