[Xerte-dev] Re: 1.8 files

[Julian Tenney]

What do you suggest we do then? Wecan wind the svns back no problem, but these aren't my changes so I'm unsure how best to proceed.
________________________________________
From: xerte-dev-bounces at lists.nottingham.ac.uk [xerte-dev-bounces at lists.nottingham.ac.uk] On Behalf Of Pat Lockley [patrick.lockley at googlemail.com]
Sent: 01 March 2012 16:26
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