Beta1 and Trunk discrepancies

List overview All Threads
Download

newer

older

[Important] Definition of...

Fwd: [xwiki-commits] [Issue]...

Vincent Massol

23 Dec 2006 23 Dec '06

10:40 a.m.

Attachments:

attachment.html (text/html — 8.5 KB)
attachment-js.jpg (image/jpeg — 26.5 KB)
indexupdater-java.jpg (image/jpeg — 62.9 KB)
image-js.jpg (image/jpeg — 135.8 KB)
editor_template-java.jpg (image/jpeg — 154.7 KB)
image-htm.jpg (image/jpeg — 70.2 KB)
document-java.jpg (image/jpeg — 34.3 KB)

Show replies by date

Ludovic Dubost

23 Dec 23 Dec

4:01 p.m.

New subject: [xwiki-dev] Beta1 and Trunk discrepancies

I think these changes (the right part) should be in the trunk. If I recall correctly these additions have been done only in the trunk I should have merges the beta 1 properly in the trunk.. Ludovic Vincent Massol a écrit :

...

To XWiki developers who have committed for 1.0 beta1: I'd like to close the 1.0 beta 1 branch now that 1.0 beta 1 has been delivered (and have a 1.0 beta 1 tag). However before doing so I've done a quick compare of trunk and beta1 branch and I've found the following changes that are newer in the beta1 branch than in trunk. I'd like to be sure we're not missing anything in trunk. Could you please verify that the trunk is ok for these files please? (I've attached screenshots of diffs to make it easy for you :-)) The left pane in the image represents beta1 and the left one represents trunk. Name State Type Changes Left Time Right Time Relative Directory ------------------------------------------------- ------------- ------ ------- -------------- -------------- ---------------------------------------------------------------------- Document.java Left Younger Text ~1 18/12/06 12:05 17/12/06 13:49 core/src/main/java/com/xpn/xwiki/api IndexUpdater.java Left Younger Text +3 18/12/06 12:04 17/12/06 13:49 core/src/main/java/com/xpn/xwiki/plugin/lucene editor_template.js Left Younger Text +11 ~53 18/12/06 12:14 18/12/06 10:44 web/standard/src/main/webapp/tiny_mce_2/themes/wikieditor image.htm Left Younger Text +12 18/12/06 12:14 18/12/06 10:44 web/standard/src/main/webapp/tiny_mce_2/themes/wikieditor image.js Left Younger Text +6 ~2 18/12/06 12:14 18/12/06 10:44 web/standard/src/main/webapp/tiny_mce_2/themes/wikieditor/jscripts attachments.js Left Younger Text +12 ~29 18/12/06 12:14 18/12/06 10:44 web/standard/src/main/webapp/wiki_editor_2/plugins Thanks -Vincent ------------------------------------------------------------------------ ------------------------------------------------------------------------ ------------------------------------------------------------------------ ------------------------------------------------------------------------ ------------------------------------------------------------------------ ------------------------------------------------------------------------ ------------------------------------------------------------------------ -- You receive this message as a subscriber of the xwiki-dev(a)objectweb.org mailing list. To unsubscribe: mailto:xwiki-dev-unsubscribe@objectweb.org For general help: mailto:sympa@objectweb.org?subject=help ObjectWeb mailing lists service home page: http://www.objectweb.org/wws

-- Ludovic Dubost Blog: http://www.ludovic.org/blog/ XWiki: http://www.xwiki.com Skype: ldubost GTalk: ldubost AIM: nvludo Yahoo: ludovic

Vincent Massol

5:19 p.m.

New subject: [xwiki-dev] Beta1 and Trunk discrepancies

...

-----Original Message----- From: Ludovic Dubost [mailto:ludovic@xwiki.com] Sent: samedi 23 décembre 2006 16:02 To: xwiki-dev(a)objectweb.org Subject: Re: [xwiki-dev] Beta1 and Trunk discrepancies I think these changes (the right part) should be in the trunk. If I recall correctly these additions have been done only in the trunk I should have merges the beta 1 properly in the trunk..

Sorry I'm not sure what you mean. The tool I've used (smart synchronize) says that left (beta1) is newer than the right (trunk). Are you saying this is not correct? I've seen your merges and I ran the tool after you made the changes. The tool still reports discrepancies which we have to analyze. Thanks -Vincent

...

Vincent Massol a écrit :

Document.java Left Younger Text ~1 18/12/06 12:05 17/12/06 13:49 core/src/main/java/com/xpn/xwiki/api IndexUpdater.java Left Younger Text +3 18/12/06 12:04 17/12/06 13:49 core/src/main/java/com/xpn/xwiki/plugin/lucene editor_template.js Left Younger Text +11 ~53 18/12/06 12:14 18/12/06 10:44 web/standard/src/main/webapp/tiny_mce_2/themes/wikieditor image.htm Left Younger Text +12 18/12/06 12:14 18/12/06 10:44 web/standard/src/main/webapp/tiny_mce_2/themes/wikieditor image.js Left Younger Text +6 ~2 18/12/06 12:14 18/12/06 10:44 web/standard/src/main/webapp/tiny_mce_2/themes/wikieditor/jscripts attachments.js Left Younger Text +12 ~29 18/12/06 12:14 18/12/06 10:44 web/standard/src/main/webapp/wiki_editor_2/plugins Thanks -Vincent ---------------------------------------------------------------------

-- ---------------------------------------------------------------------

-- -- You receive this message as a subscriber of the xwiki-

dev(a)objectweb.org mailing list.

To unsubscribe: mailto:xwiki-dev-unsubscribe@objectweb.org For general help: mailto:sympa@objectweb.org?subject=help ObjectWeb mailing lists service home page: http://www.objectweb.org/wws

-- Ludovic Dubost Blog: http://www.ludovic.org/blog/ XWiki: http://www.xwiki.com Skype: ldubost GTalk: ldubost AIM: nvludo Yahoo: ludovic

Ludovic Dubost

24 Dec 24 Dec

1:55 p.m.

New subject: [xwiki-dev] Beta1 and Trunk discrepancies

The code on the right has been commited in the trunk before we released XWiki 1.0b1 It was done on purpose because these changes could have been dangerous for the release. So I believe everything is normal Ludovic Vincent Massol a écrit :

...

Vincent Massol a écrit :

-- ---------------------------------------------------------------------

-- -- You receive this message as a subscriber of the xwiki-

dev(a)objectweb.org mailing list.

To unsubscribe: mailto:xwiki-dev-unsubscribe@objectweb.org For general help: mailto:sympa@objectweb.org?subject=help ObjectWeb mailing lists service home page: http://www.objectweb.org/wws

-- Ludovic Dubost Blog: http://www.ludovic.org/blog/ XWiki: http://www.xwiki.com Skype: ldubost GTalk: ldubost AIM: nvludo Yahoo: ludovic

___________________________________________________________________________ Découvrez une nouvelle façon d'obtenir des réponses à toutes vos questions ! Profitez des connaissances, des opinions et des expériences des internautes sur Yahoo! Questions/Réponses http://fr.answers.yahoo.com ------------------------------------------------------------------------ -- You receive this message as a subscriber of the xwiki-dev(a)objectweb.org mailing list. To unsubscribe: mailto:xwiki-dev-unsubscribe@objectweb.org For general help: mailto:sympa@objectweb.org?subject=help ObjectWeb mailing lists service home page: http://www.objectweb.org/wws

-- Ludovic Dubost Blog: http://www.ludovic.org/blog/ XWiki: http://www.xwiki.com Skype: ldubost GTalk: ldubost AIM: nvludo Yahoo: ludovic

Vincent Massol

29 Dec 29 Dec

2:48 p.m.

New subject: [xwiki-dev] Beta1 and Trunk discrepancies

Ok. Thanks I'm about the svn remove the 1.0 Beta 1 branch. We already have a 1.0 Beta 1 tag and it's dangerous to keep the 1.0 beta 1 branch as nobody is supposed to commit anything to it anymore. It's basically a dead branch now. Please shout quickly if you don't want me to delete it for any reason! :-) Thanks -Vincent

...

-----Original Message----- From: Ludovic Dubost [mailto:ludovic@xwiki.com] Sent: dimanche 24 décembre 2006 13:55 To: xwiki-dev(a)objectweb.org Subject: Re: [xwiki-dev] Beta1 and Trunk discrepancies The code on the right has been commited in the trunk before we released XWiki 1.0b1 It was done on purpose because these changes could have been dangerous for the release. So I believe everything is normal Ludovic Vincent Massol a écrit :

discrepancies which we have to analyze.

Thanks -Vincent > Vincent Massol a écrit : > >> To XWiki developers who have committed for 1.0 beta1: >> >> >> >> I'd like to close the 1.0 beta 1 branch now that 1.0 beta 1 has

been

>> delivered (and have a 1.0 beta 1 tag). However before doing so I've >> done a quick compare of trunk and beta1 branch and I've found the >> following changes that are newer in the beta1 branch than in trunk. >> I'd like to be sure we're not missing anything in trunk. >> >> >> >> Could you please verify that the trunk is ok for these files

please?

>> (I've attached screenshots of diffs to make it easy for you :-)) >> >> >> >> The left pane in the image represents beta1 and the left one >> represents trunk. >> >> >> >> Name State >> Type Changes Left Time Right Time

Relative

>> Directory >> >> ------------------------------------------------- ------------- >> ------ ------- -------------- -------------- >> -------------------------------------------------------------------

>> - >> > - > >> Document.java Left Younger >> Text ~1 18/12/06 12:05 17/12/06 13:49 >> core/src/main/java/com/xpn/xwiki/api >> >> IndexUpdater.java Left Younger >> Text +3 18/12/06 12:04 17/12/06 13:49 >> core/src/main/java/com/xpn/xwiki/plugin/lucene >> >> editor_template.js Left Younger >> Text +11 ~53 18/12/06 12:14 18/12/06 10:44 >> web/standard/src/main/webapp/tiny_mce_2/themes/wikieditor >> >> image.htm Left Younger >> Text +12 18/12/06 12:14 18/12/06 10:44 >> web/standard/src/main/webapp/tiny_mce_2/themes/wikieditor >> >> image.js Left Younger >> Text +6 ~2 18/12/06 12:14 18/12/06 10:44 >> web/standard/src/main/webapp/tiny_mce_2/themes/wikieditor/jscripts >> >> attachments.js Left Younger >> Text +12 ~29 18/12/06 12:14 18/12/06 10:44 >> web/standard/src/main/webapp/wiki_editor_2/plugins >> >> >> >> Thanks >> >> -Vincent >> >> >> >> >> >> >> >> >> -------------------------------------------------------------------

>> - >> > - > >> -- >> >> >> -------------------------------------------------------------------

>> - >> > - > >> -- >> >> -------------------------------------------------------------------

-- -- You receive this message as a subscriber of the xwiki-

dev(a)objectweb.org mailing list.

To unsubscribe: mailto:xwiki-dev-unsubscribe@objectweb.org For general help: mailto:sympa@objectweb.org?subject=help ObjectWeb mailing lists service home page: http://www.objectweb.org/wws

-- Ludovic Dubost Blog: http://www.ludovic.org/blog/ XWiki: http://www.xwiki.com Skype: ldubost GTalk: ldubost AIM: nvludo Yahoo: ludovic

______________________________________________________________________

_____ Découvrez une nouvelle façon d'obtenir des réponses à toutes

vos

questions ! Profitez des connaissances, des opinions et des expériences des internautes sur Yahoo! Questions/Réponses http://fr.answers.yahoo.com ---------------------------------------------------------------------

-- -- You receive this message as a subscriber of the xwiki-

dev(a)objectweb.org mailing list.

To unsubscribe: mailto:xwiki-dev-unsubscribe@objectweb.org For general help: mailto:sympa@objectweb.org?subject=help ObjectWeb mailing lists service home page: http://www.objectweb.org/wws

-- Ludovic Dubost Blog: http://www.ludovic.org/blog/ XWiki: http://www.xwiki.com Skype: ldubost GTalk: ldubost AIM: nvludo Yahoo: ludovic

6568

days inactive

6574

days old

xwiki-devs@xwiki.org

Manage subscription

4 comments

2 participants

tags (0)

participants (2)

Ludovic Dubost
Vincent Massol