[BNM] Alternative Diff viewer

[Karim Ahmed]

Sorry, not windiff, I meant Winmerge!

2009/3/14 Karim Ahmed <bnm at karimahmed.com>

> windiff
>
> 2009/3/13 Jez Nicholson <jez.nicholson at gmail.com>
>
> KDiff
>>
>> On Fri, Mar 13, 2009 at 11:07 AM, Leo Brown <lists at acumendevelopment.net>
>> wrote:
>> > Hi
>> >
>> > Use `diff -ur` for recursive comparison, same output as SVN without
>> having
>> > to version it. Using NFS or similar you can compare without copying
>> anything
>> > over too.
>> >
>> > HTH
>> > Leo
>> >
>> > -----Original Message-----
>> > From: bnmlist-bounces at brightonnewmedia.org
>> > [mailto:bnmlist-bounces at brightonnewmedia.org] On Behalf Of Jason Bailey
>> > Sent: 13 March 2009 10:11
>> > To: brighton new media
>> > Subject: [BNM] Alternative Diff viewer
>> >
>> > Hello,
>> >
>> > I use the TortoiseSVN Diff view to compare version etc but I'm looking
>> for
>> > something else. Can anyone suggest an alternative?
>> >
>> > Here's what I'm trying to do.
>> >
>> > I've got some old code sitting on a php4 server which I was upgrading to
>> > php5; mainly better DB connections/ ORM stuff. While doing this some
>> > changes came in to the old system which I had to put in as this is the
>> > current sytem. I've not yet put the changes into the new system; I want
>> to
>> > do that now-ish so can move over quickly and drop the old stuff.
>> >
>> > I'm after a diff view that will allow me to compare versions on two
>> > different servers. I can copy the files to a local drive/mount that's no
>> > problem but rather than compare a working copy with a previous version I
>> > want to compare files in different folders. I could SVN the php4 and
>> php5
>> > into a temporary repo; that makes sense but I want to compare system1,2
>> and
>> > 3 in one of the systems too; does that make sense? So I can draw out the
>> > similar code and stick it all in one place.
>> >
>> > Is there anything that will do this (OS is not important). Cheap/free is
>> > good but at least a demo available so I can test it. I can see ways of
>> > getting tortoiseSVN to do it all but would involve lots of tagging.
>> >
>> > I've got something like this:
>> >
>> > php5server /livecode
>> >                            /system1 ./../.php
>> >                            /system2
>> >                            /system3
>> >                /devcode
>> >                           /system1
>> >                            /system2
>> >                            /system3
>> >
>> >                /testcode
>> >                           /system1
>> >                            /system2
>> >                            /system3
>> >
>> > php4server /livecode
>> >                            /system1
>> >                            /system2
>> >                            /system3
>> >                /devcode
>> >                           /system1
>> >                            /system2
>> >                            /system3
>> >
>> >            /test......
>> >                        /...
>> >
>> >
>> > So there's a lot to look at; at the moment. I got caught out with some
>> > changes in the middle of it all. So the php5 and 4 server have different
>> DB
>> > connections (I'm half way through yuk!) and there are also differences,
>> > now, in the logic, due to recent changes.
>> >
>> > System1, 2 and 3 share some similarities which I'd now like to
>> consolidate
>> > i.e. shared files and logic but still some differences; the differences
>> > have ended up nowhere near as much as I first thought.
>> >
>> > Thanks
>> > jason
>> >
>> > --
>> > Jason Bailey
>> > IT Services
>> > University of Sussex
>> > http://www.sussex.ac.uk/USIS/phone/details.php?id=17011
>> > --
>> >
>> > BNM Subscribe/Unsubscribe:
>> > http://www.brightonnewmedia.org/options/bnmlist
>> >
>> > BNM powered by Wessex Networks:
>> > http://www.wessexnetworks.com
>> >
>> > --
>> >
>> > BNM Subscribe/Unsubscribe:
>> > http://www.brightonnewmedia.org/options/bnmlist
>> >
>> > BNM powered by Wessex Networks:
>> > http://www.wessexnetworks.com
>> >
>> --
>>
>> BNM Subscribe/Unsubscribe:
>> http://www.brightonnewmedia.org/options/bnmlist
>>
>> BNM powered by Wessex Networks:
>> http://www.wessexnetworks.com
>>
>
>
>
> --
> Location
>



-- 
Location