[pLog-svn] r2476 - plog/tags

[Jon Daley]

Here are my notes from the merge.  It was harder than I thought it would 
be.
I have done a sanity check on all of the changes, but I am not sure if I 
got everything correctly.  I gave up entirely on the dao part, the diffs 
did not work, and even going through line by line was hard, due to the 
huge amount of change.


plog 1.0.2 started at rev 2075
   copied from plog 1.0.1 (rev 2069)

plog 1.0.1 started at rev 1676
   copied from trunk (1675)
plog 1.0.1 merged into trunk at rev 2128


Current trunk rev 2477
(2478 is a locale change - just a dos2unix issue)

js/ie7 breaks in 2358

executed merge 2075:2357  committed in rev 2479.
Major issues:
articles.class.php: Used trunk
blogs.class.php: Used trunk
articlecomments.class.php: trunk
bloginfo: trunk - but this isn't going to work.
articlecategories: trunk

executed merge 2357:2358 committed in rev 2480.

executed merge 2358:2477
adminmainaction sessioninfo save blogId?


On Sun, 18 Sep 2005, Oscar Renalias wrote:

> Jon, I think you can go ahead and merge branches/plog-1.0.2 with the 
> trunk/... You'll probably have some trouble with the dao/ folder but when in 
> doubt, use the trunk version!
>
> Let us know if you have any other problem!
>
> Oscar
>
> On 17 Sep 2005, at 23:38, oscar at devel.plogworld.net wrote:
>
>> Author: oscar
>> Date: 2005-09-17 20:38:02 +0000 (Sat, 17 Sep 2005)
>> New Revision: 2476
>> 
>> Added:
>>   plog/tags/plog-1.0.2-beta/
>> Log:
>> tag for plog-1.0.2 beta
>> 
>> 
>> Copied: plog/tags/plog-1.0.2-beta (from rev 2475, plog/branches/plog-1.0.2)
>> 
>> _______________________________________________
>> pLog-svn mailing list
>> pLog-svn at devel.plogworld.net
>> http://devel.plogworld.net/mailman/listinfo/plog-svn
>> 
>> 
>
> _______________________________________________
> pLog-svn mailing list
> pLog-svn at devel.plogworld.net
> http://devel.plogworld.net/mailman/listinfo/plog-svn

**************************************
Jon Daley
http://jon.limedaley.com/plog/

In Nicholas County, WV, no member of the clergy is allowed to tell
jokes or humerous stories from the pulpit during a church service.