Hi commiters...

I've added some of you here because I think this bug is a good way to emit alerts when the list of unmerged files is becoming really big.

Feel free to "unwatch" this if you aren't interested on it. Anyway I promise not to spam you with alerts too much. Also, suggest more people to become subscribed if you think it's a good idea.

Thanks and ciao

P.S.: Of course, the list is becoming BIG these days. If you can review your work there it would be great!

http://docs.moodle.org/en/Unmerged_files

I was going to update the list of unmerged files at Moodle Docs, when I've detected that somebody has moved the MOODLE_18_MERGED tag for all Moodle code so, now, aparently, there aren't any unmerged files.

But they are there so, please... take a look to them in the Wiki page (http://docs.moodle.org/en/Unmerged_files ) and please, delete those files that you know are properly merged.

Tomorrow (24 from now), I'll examine the rest, moving the tag as necessary and reviewing all the wrong move operation performed by somebody last night.

Ciao

Update status:

right now near everything is merged. But there are 4 area where some files are remaining:

• auth/cas: Practically entire. It seems that there was one big update about a new release and it's only in 18_STABLE, not in HEAD (MDL-10366).

• scorm: there are a bunch of them, I've reviewed the obvious ones (lang files...) but the remaining ones....

• some mnet related files.

• some theme files.

So, please, involved people, take a look to them. I'll continue tomorrow, but I'm pretty sure that it easier for you.

TIA and ciao

The list is now really smaller! B-)

Plz, scorm, mnet and themes people... one more (the last) effort!

Ciao

Eloy, I saw you comment here this morning an thought - he really wants me to do the themes cleanup And did it.

Hehe, thanks Urs! (updating http://docs.moodle.org/en/Unmerged_files now)

At this moment MOODLE_18_STABLE is all merged and up to date

I'm back!

And unmerged files too... specially some en help files.... if branching is NEAR better to have them reduced to 0.

Ciao

Hi. I've moved the merge tag for 42 en help files - Woops! Thanks Nick

(Hi. Missed some! Just moved the MOODLE_18_MERGED tag for remaining 3 help files: help/html.html, index.html, text.html )

Adding some new developers here... please review http://docs.moodle.org/en/Development:Unmerged_files

TIA and ciao

Please review the list of unmerged files. http://docs.moodle.org/en/Development:Unmerged_files

From 0 it's really big now. TIA!

Hi,

this is a call for review the list of unmerged files, both 1.8 and 1.9.

http://docs.moodle.org/en/Development:Unmerged_files

It seems that something with the /search code needs adjusting. Also mnet code appears often.

TIA and ciao

Hi,

this is a big PING for everybody to review the list of 1.8 and 1.9 unmerged files. It seems to be growing a lot!

http://docs.moodle.org/en/Development:Unmerged_files

TIA and ciao

Adding some more developers here...

Hi all,

raising this to MAJOR because the number of files under the 18_STABLE branch is really BIG.

Please developers, review them (also, please, take a look to the old 17_STABLE). It would be great to have both branches 100% merged.

TIA and merry Xmas!

Done on /moodle/search and /contrib/plugins/mod/techproject for branch 18
Hope it worked.
Happy new year !!

All good for 1.9

Hi developers,

I've finished iterating over all the unmerged files present in 17_STABLE, 18_STABLE and 19_STABLE, adjusting the MERGED tag as needed (or merging changes if necessary).

Finally, I've ended with only TWO files needing review, one theme file (from Andrea) in the 18_STABLE branch, needing confirmation, and one hotpot file (Gordon) that seems to be unmerged.

With both resolved, we'll have ZERO unmerged files.

http://docs.moodle.org/en/Development:Unmerged_files

Ciao and thanks!

Thanks for your eagle-eyed, hard work Eloy !

The HotPot file we are talking about is "mod/hotpot/grade.lib" in MOODLE_19? OK, I have just moved the MOODLE_19_MERGED tag for that file, so it should be clear now.

cheers
Gordon

Ping!

Valery, I've just updated http://docs.moodle.org/en/Development:Unmerged_files and it seems that, under 18_STABLE and 19_STABLE there are dozens of filed under "search" with the MERGED tag not properly set.

I guess it's only a matter of the tag not properly moved and that everything is properly merged in HEAD. Just if you can check and clean those files... that will leave the list really small.

Also... welcome to the list, Dongsheng... it seems that about of you latest commits into 19_STABLE:

1) they weren't properly merged or...
2) their MERGED tab wasn't properly moved in branches.

Can you take a look to that? Thanks! Ciao

Processed merge procedure (from docs.moodle.org/Development;CVS for developers) for 18_STABLE /search

Hope its OK.

Continue with other unmerge volumes under search scope...

Valéry.

Processed merge procedure (from docs.moodle.org/Development;CVS for developers) for 18_STABLE /block/search

Cheers.... it's late...

Thanks Valery... rebuilding the list right now! B-)

PING!

Hi can all you, please, take a look to the unmerged files page:

http://docs.moodle.org/en/Development:Unmerged_files

and fix your pending merges?

TIA and ciao, Eloy

done, found problem in MDL-15530 and in /search/ code, both reported in related bugs,
closing now...

Only 2 files in 18_STABLE and 3 in 19_STABLE remaining to be merged... will we be able to reduce all them to:

None! B-)

Ciao

Reopening because the list has grown a bit again, please, review.

http://docs.moodle.org/en/Development:Unmerged_files

Ciao

Raising to Blocker... before new releases, please review the list.

http://docs.moodle.org/en/Unmerged_files

Ciao

Lowering to Major. Now 19_STABLE is free of unmerged files (only a few remain in 18_STABLE). Thanks!

Ping!

Please review http://docs.moodle.org/en/Development:Unmerged_files#Files_with_MOODLE_19_MERGED_tag_not_updated_-_Tue_Nov_18_00:27:44_CET_2008

TIA!

Raising to blocker. Please, guys take a look to http://docs.moodle.org/en/Development:Unmerged_files It's growing too much. TIA!

Resolving as fixed for now. I've reviewed the pending files and now we are 100% merged. B-)

Thanks all. Ciao

Just for you info, since yesterday, the list of unmerged files in the Docs:

http://docs.moodle.org/en/Development:Unmerged_files

is automatically refreshed daily to keep it up-to-date.

If you find any problem, please comment here. Right now the list is pretty small. Good work! I'll continue reopening / closing this if the list grows too much.

Ciao

PS: Note that it's also planned to add one new tab to the http://moodle.org/cvs page to have the same info replicated there (in case it's useful for you). Any thoughts about that will be welcome in MDLSITE-505. Are you going to use that? Is it ok to simply link to the Docs page from the new tab? Or do we want the whole info replicated there? TIA!