[Xerte-dev] Re: SVN Versions

[Julian Tenney]

OK, I took 18 in and took the 1.8 files over the trunk files when conflicts popped up (which was a lot, pretty much every PHP file)

From: xerte-dev-bounces at lists.nottingham.ac.uk [mailto:xerte-dev-bounces at lists.nottingham.ac.uk] On Behalf Of David Goodwin
Sent: 01 March 2012 13:35
To: For Xerte technical developers
Subject: [Xerte-dev] Re: SVN Versions


On 1 Mar 2012, at 13:26, Julian Tenney wrote:


Why do we have 1.7? Wasn't that the one we took back into the trunk, and then developed in 1.8?

Normally ....

Your development would take place in trunk; over time someone like yourself Julian would decide that it's time for a new release - you'd create a branch - e.g. 1.7, and then test/work on it - probably merging many changes back to trunk. This would allow your busy team of developers to continue messing around in trunk, while 1.7 stabilised. Eventually 1.7 would be released, and perhaps over time you'd make minor bug fixes to it and have e.g. 1.7.1, 1.7.2 and so on.


>From memory, I think I merged most of the changes I made to 1.7 also into trunk - so there shouldn't be much that's different - but I've already forgotten what's where with respect to 1.7 and trunk.

I think 1.8 had the internationalisation stuff - merging that with anything will be difficult as the changes are a lot greater.


Yes, you can always revert, so there's nothing to worry about - until you start issuing 'svn commit's.


David.

Pale Purple Ltd.  (Company No: 5580814)
'Business Web Application Development and Training in PHP'

http://www.palepurple.co.uk
Office: 0845 0046746     Mobile: 07792380669

Follow us on Twitter: @PalePurpleLtd

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.nottingham.ac.uk/pipermail/xerte-dev/attachments/20120301/74747649/attachment.html>