[Xerte-dev] Re: Changes in trunk that aren't in v2

[Smith, John]

Right click on a checked out folder
Go to Tortoise menu and select Repo-browser
Expand the tree on the left so that you can see both trunk and 2.0
Right click trunk and select 'Mark for comparison'
The right click on 2.0 and select 'Compare URLs'

Brings up a new window with the different files... not figured out how to turn off whitespace compare in that step but you can when you compare individual files using the icon on the menu when you right click and choose "Compare revisions"

Regards,

John Smith | Learning Technologist
Room A251, Govan Mbeki Building | School of Health & Life Sciences | Glasgow Caledonian University
Cowcaddens Road | Glasgow | G4 0BA
________________________________________
From: xerte-dev-bounces at lists.nottingham.ac.uk [xerte-dev-bounces at lists.nottingham.ac.uk] On Behalf Of Julian Tenney [Julian.Tenney at nottingham.ac.uk]
Sent: 09 July 2013 09:52
To: For Xerte technical developers
Subject: [Xerte-dev] Re: Changes in trunk that aren't in v2

How do you bring up that diff?

-----Original Message-----
From: xerte-dev-bounces at lists.nottingham.ac.uk [mailto:xerte-dev-bounces at lists.nottingham.ac.uk] On Behalf Of Smith, John
Sent: 09 July 2013 08:12
To: xerte-dev at lists.nottingham.ac.uk
Subject: [Xerte-dev] Changes in trunk that aren't in v2

Hi,

I've just been going through the differences between trunk and v2 with the aim to make sure all my 'fixes' are in v2 as well as trunk (but trying to leave any new features in trunk only) and i'm seeing a few differences like MathJax includes that I'm thinking are probably fixes and should be in v2 but have been skipped... but i'm not always 100% sure...

It would be good if people could look through the differences for their own changes and make a decision as to whether it should go into v2.0 or wait for v2.1 ? It's relatively easy to do in Tortoise if you don't already know how... I can show...

Regards,

John Smith | Learning Technologist
Room A251, Govan Mbeki Building | School of Health & Life Sciences | Glasgow Caledonian University Cowcaddens Road | Glasgow | G4 0BA

Glasgow Caledonian University is a registered Scottish charity, number SC021474

Winner: Times Higher Education’s Widening Participation Initiative of the Year 2009 and Herald Society’s Education Initiative of the Year 2009.
http://www.gcu.ac.uk/newsevents/news/bycategory/theuniversity/1/name,6219,en.html

Winner: Times Higher Education’s Outstanding Support for Early Career Researchers of the Year 2010, GCU as a lead with Universities Scotland partners.
http://www.gcu.ac.uk/newsevents/news/bycategory/theuniversity/1/name,15691,en.html
_______________________________________________
Xerte-dev mailing list
Xerte-dev at lists.nottingham.ac.uk
http://lists.nottingham.ac.uk/mailman/listinfo/xerte-dev
_______________________________________________
Xerte-dev mailing list
Xerte-dev at lists.nottingham.ac.uk
http://lists.nottingham.ac.uk/mailman/listinfo/xerte-dev

Glasgow Caledonian University is a registered Scottish charity, number SC021474

Winner: Times Higher Education’s Widening Participation Initiative of the Year 2009 and Herald Society’s Education Initiative of the Year 2009.
http://www.gcu.ac.uk/newsevents/news/bycategory/theuniversity/1/name,6219,en.html

Winner: Times Higher Education’s Outstanding Support for Early Career Researchers of the Year 2010, GCU as a lead with Universities Scotland partners.
http://www.gcu.ac.uk/newsevents/news/bycategory/theuniversity/1/name,15691,en.html