[Xerte-dev] Re: 1.8 files

[Julian Tenney]

I updated everything to have the latest files.

I merged 1.7 into trunk. 

Commited that.

Merged 1.8 into trunk. Accepted 'use repository' as the option for conflicts (thinking this would use the files from 1.8 over the files in trunk).

Commited that - that's where we are now.

Did nothing to try and resolve conflicts. Pretty much every php file conflicted, which puzzled me a bit.

If you want to go back to square one, revert trunk to r260. Nothing should have changed in 1.8 or 1.7. It's the web application to worry about: don't worry about anything about templates, .rlms xmlengine, all that stuff. I can add all that in confidently.

Thanks,

-----Original Message-----
From: xerte-dev-bounces at lists.nottingham.ac.uk [mailto:xerte-dev-bounces at lists.nottingham.ac.uk] On Behalf Of Tom Reijnders
Sent: 02 March 2012 09:33
To: For Xerte technical developers
Subject: [Xerte-dev] Re: 1.8 files

Julian,

Just a question, did you checkout trunk and than tried to merge in (svn 
merge) 1.8, or did you checkout trunk, checkout 1.8 and tried to figure 
out the diffs?

What is the current state of trunk? Did you already (try) to commit changes?

Op 2-3-2012 9:42, Julian Tenney schreef:
>> The trunk to 1.8 changes made the 1.8 out of sync, so each difference will need to be worked out. I've already done that once, not that keen on doing it again.
> This is the bit I'm confused at. Why should it need to be done again?
>
> -----Original Message-----
> From: xerte-dev-bounces at lists.nottingham.ac.uk [mailto:xerte-dev-bounces at lists.nottingham.ac.uk] On Behalf Of Pat Lockley
> Sent: 01 March 2012 16:27
> To: For Xerte technical developers
> Subject: [Xerte-dev] Re: 1.8 files
>
> I made one big submission for 1.8, and then copied over the changes
> that had happened in between. So 1.8 should have two blocks of
> commits. Nothing since.
>
> I don't know what has changed in trunk (I haven't committed to
> anything other than 1.8).
>
> The trunk to 1.8 changes made the 1.8 out of sync, so each difference
> will need to be worked out. I've already done that once, not that keen
> on doing it again.
>
> On Thu, Mar 1, 2012 at 1:47 PM, Julian Tenney
> <Julian.Tenney at nottingham.ac.uk>  wrote:
>> Pat, where have you been checking your files in? To 1.8? Should I take 1.8
>> conflicts over to the trunk, or leave the trunk files? Therea r anumber of
>> conflicting modifications. Somme I an say are OK, cos I know what the score
>> is (XMLEngine.swf for example) but other (play.php) I don't.
>>
>>
>>
>> I'm guessing that 1.8 should over-write the trunk files?
>>
>>
>> This message and any attachment are intended solely for the addressee and
>> may contain confidential information. If you have received this message in
>> error, please send it back to me, and immediately delete it. Please do not
>> use, copy or disclose the information contained in this message or in any
>> attachment. Any views or opinions expressed by the author of this email do
>> not necessarily reflect the views of the University of Nottingham.
>>
>> This message has been checked for viruses but the contents of an attachment
>> may still contain software viruses which could damage your computer system:
>> you are advised to perform your own checks. Email communications with the
>> University of Nottingham may be monitored as permitted by UK legislation.
>>
>>
>> _______________________________________________
>> Xerte-dev mailing list
>> Xerte-dev at lists.nottingham.ac.uk
>> http://lists.nottingham.ac.uk/mailman/listinfo/xerte-dev
>>
>> This message and any attachment are intended solely for the addressee and
>> may contain confidential information. If you have received this message in
>> error, please send it back to me, and immediately delete it.   Please do not
>> use, copy or disclose the information contained in this message or in any
>> attachment.  Any views or opinions expressed by the author of this email do
>> not necessarily reflect the views of the University of Nottingham.
>>
>> This message has been checked for viruses but the contents of an attachment
>> may still contain software viruses which could damage your computer system:
>> you are advised to perform your own checks. Email communications with the
>> University of Nottingham may be monitored as permitted by UK legislation.
>>
>>
> _______________________________________________
> 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
>

-- 
--

Tom Reijnders
TOR Informatica
Chopinlaan 27
5242HM Rosmalen
Tel: 073 5226191
Fax: 073 5226196



_______________________________________________
Xerte-dev mailing list
Xerte-dev at lists.nottingham.ac.uk
http://lists.nottingham.ac.uk/mailman/listinfo/xerte-dev