[arch-projects] merging for 1.4.0
The merge window for 1.4.0 will close Friday, 9/28. After that, just regressions/bugfixes will be pulled. I may cherrypick one or two fixes and roll a 1.3.2 before then. I am working on merging masters from the following people into my testing branch: eliott (done) louipc tardo xilon It probably does make sense for folks to rebase off of the release repo at this point (http://git.mattal.com/aur), if they want their changes incorporated. There were substantial conflicts merging from everyone but eliott, and I am not sure how long it will take me to sort all of that out. If you want your stuff to get, please work on eliminating conflicts between your repos and mine; hopefully this will be a 1-time hassle and then we'll be into smooth sailing. I will generally do my merging work on the subzero checkout, and push things pack to the public repo when I've sanity checked them. The upshot of this-- you can use the subzero url to effectively monitor the state of my testing branch. As we get close to a stable release, I'll probably switch subzero over to the stable tree, but I'll announce that when it happens. https://subzero.elys.com - P
Paul Mattal wrote:
The merge window for 1.4.0 will close Friday, 9/28. After that, just regressions/bugfixes will be pulled. I may cherrypick one or two fixes and roll a 1.3.2 before then.
I am working on merging masters from the following people into my testing branch:
eliott (done) louipc tardo xilon
It probably does make sense for folks to rebase off of the release repo at this point (http://git.mattal.com/aur), if they want their
Sorry for the mistaken url. This should of course be: git://git.mattal.com/aur - P
The merge window for 1.4.0 will close Friday, 9/28. After that, just regressions/bugfixes will be pulled. I may cherrypick one or two fixes and roll a 1.3.2 before then.
I am working on merging masters from the following people into my testing branch:
eliott (done) louipc tardo xilon
It probably does make sense for folks to rebase off of the release repo at this point (http://git.mattal.com/aur), if they want their changes incorporated. There were substantial conflicts merging from everyone but eliott, and I am not sure how long it will take me to sort all of that out. If you want your stuff to get, please work on eliminating conflicts between your repos and mine; hopefully this will be a 1-time hassle and then we'll be into smooth sailing.
I will generally do my merging work on the subzero checkout, and push things pack to the public repo when I've sanity checked them. The upshot of this-- you can use the subzero url to effectively monitor the state of my testing branch. As we get close to a stable release, I'll probably switch subzero over to the stable tree, but I'll announce that when it happens.
- P
I think i fixed it on my end. Try pulling my master again and see if you still get conflicts. - tardo
What's going to be in 1.4.0? On 9/25/07, tardo@nagi-fanboi.net <tardo@nagi-fanboi.net> wrote:
The merge window for 1.4.0 will close Friday, 9/28. After that, just regressions/bugfixes will be pulled. I may cherrypick one or two fixes and roll a 1.3.2 before then.
I am working on merging masters from the following people into my testing branch:
eliott (done) louipc tardo xilon
It probably does make sense for folks to rebase off of the release repo at this point (http://git.mattal.com/aur), if they want their changes incorporated. There were substantial conflicts merging from everyone but eliott, and I am not sure how long it will take me to sort all of that out. If you want your stuff to get, please work on eliminating conflicts between your repos and mine; hopefully this will be a 1-time hassle and then we'll be into smooth sailing.
I will generally do my merging work on the subzero checkout, and push things pack to the public repo when I've sanity checked them. The upshot of this-- you can use the subzero url to effectively monitor the state of my testing branch. As we get close to a stable release, I'll probably switch subzero over to the stable tree, but I'll announce that when it happens.
- P
I think i fixed it on my end. Try pulling my master again and see if you still get conflicts.
- tardo
_______________________________________________ arch-projects mailing list arch-projects@archlinux.org http://archlinux.org/mailman/listinfo/arch-projects
-- Alex Heck - nesl247
On 9/25/07, nesl247 <nesl247@gmail.com> wrote:
What's going to be in 1.4.0?
Everything except the bugfixes that I originally started hacking to try and fix! Ooooer! But really that's yet to be determined until conflicts are resloved, etc.
nesl247 wrote:
What's going to be in 1.4.0?
On 9/25/07, tardo@nagi-fanboi.net <tardo@nagi-fanboi.net> wrote:
The merge window for 1.4.0 will close Friday, 9/28. After that, just regressions/bugfixes will be pulled. I may cherrypick one or two fixes and roll a 1.3.2 before then.
I am working on merging masters from the following people into my testing branch:
eliott (done) louipc tardo xilon
It probably does make sense for folks to rebase off of the release repo at this point (http://git.mattal.com/aur), if they want their changes incorporated. There were substantial conflicts merging from everyone but eliott, and I am not sure how long it will take me to sort all of that out. If you want your stuff to get, please work on eliminating conflicts between your repos and mine; hopefully this will be a 1-time hassle and then we'll be into smooth sailing.
I will generally do my merging work on the subzero checkout, and push things pack to the public repo when I've sanity checked them. The upshot of this-- you can use the subzero url to effectively monitor the state of my testing branch. As we get close to a stable release, I'll probably switch subzero over to the stable tree, but I'll announce that when it happens.
- P
I think i fixed it on my end. Try pulling my master again and see if you still get conflicts.
- tardo
_______________________________________________ arch-projects mailing list arch-projects@archlinux.org http://archlinux.org/mailman/listinfo/arch-projects
For starters, the layout will now match the AL homepage. Other than that, various annoying bugs are squashed. - tardo
nesl247 wrote:
What's going to be in 1.4.0?
I plan to release everything in my testing branch as of Friday, plus regressions, sometime over the weekend, as 1.4.0. Check out the following for the story of our hero so far: http://git.mattal.com/gitweb.cgi?p=aur.git;a=shortlog;h=testing - P
PHEW rebasing then merging was a doosey. You should be able to pull flawlessly now. Hmm now there are some changes you may want and some that you may not want. And they're not really in single commits particularly ( sorry :( ) The thing is I've taken a LOT of the presentation code out of stuff in lib/ and put it in template/, I did use some of the styles/layout that eliott had implemented but I didn't get the chance to get them all into template/, also I was stripping out some layout tables and I haven't tried to really style and lay them out nicely (I figured I'd ask eliott since he has a good eye for it). Well check it out and see what you think. Thanks. It's probably easier to just look at the raw code than the diffs heh. On 9/25/07, Paul Mattal <paul@mattal.com> wrote:
nesl247 wrote:
What's going to be in 1.4.0?
I plan to release everything in my testing branch as of Friday, plus regressions, sometime over the weekend, as 1.4.0. Check out the following for the story of our hero so far:
http://git.mattal.com/gitweb.cgi?p=aur.git;a=shortlog;h=testing
- P
_______________________________________________ arch-projects mailing list arch-projects@archlinux.org http://archlinux.org/mailman/listinfo/arch-projects
I'm thinking that I'll clone your repo and apply my changes in a cleaner/more organised way
Loui wrote:
I'm thinking that I'll clone your repo and apply my changes in a cleaner/more organised way
Thanks. It's great to have such a hard-working team contributing so much! We're really going to make some serious strides with this release. - P
On 9/26/07, Paul Mattal <paul@mattal.com> wrote:
Thanks. It's great to have such a hard-working team contributing so much! We're really going to make some serious strides with this release.
Yeah! We better! Anyhoo I've made some nice clean commits off of the testing branch. Pull em out and I'll do some more! I don't want to get too ahead of myself now and get a possibility of escalating merge conflicts :D
Loui wrote:
On 9/26/07, Paul Mattal <paul@mattal.com> wrote:
Thanks. It's great to have such a hard-working team contributing so much! We're really going to make some serious strides with this release.
Yeah! We better! Anyhoo I've made some nice clean commits off of the testing branch. Pull em out and I'll do some more! I don't want to get too ahead of myself now and get a possibility of escalating merge conflicts :D
Merged. Thanks! The only tricky bit was making sure we rewrite the config.inc file. I'll have to make sure I do that when we roll out. - P
On 9/27/07, Paul Mattal <paul@mattal.com> wrote:
Merged. Thanks!
The only tricky bit was making sure we rewrite the config.inc file. I'll have to make sure I do that when we roll out. Ah yeah. I should have said something about that. Doh.
OK. I have the first bits of work on separating presentation code from the rest. The idea behind stuff in web/template/ is that all variables are defined outside of the template itself so there's no DB action or anything to complicate the markup. Just markup and print the values you want output in the appropriate places, or check the variables for custom output (eg. whether to display a login box, or "logged in as" string)
More changes on my side: - put search_accounts_form into template/ - a ton of changes and fixes for web/lib/acctfuncs.inc I'll let that sit for a little bit now. :D
So what's going on? Are we going to have it today? And if so, about what time (please in EST :p) On 9/27/07, Loui <louipc.ist@gmail.com> wrote:
More changes on my side: - put search_accounts_form into template/ - a ton of changes and fixes for web/lib/acctfuncs.inc
I'll let that sit for a little bit now. :D
_______________________________________________ arch-projects mailing list arch-projects@archlinux.org http://archlinux.org/mailman/listinfo/arch-projects
-- Alex Heck - nesl247
nesl247 wrote:
So what's going on? Are we going to have it today? And if so, about what time (please in EST :p)
I think I can get it out tomorrow. It's just been busier than I thought here today, and I don't want to botch the new config file. Hoping to get it right the first time! - P
tardo@nagi-fanboi.net wrote:
The merge window for 1.4.0 will close Friday, 9/28. After that, just regressions/bugfixes will be pulled. I may cherrypick one or two fixes and roll a 1.3.2 before then.
I am working on merging masters from the following people into my testing branch:
eliott (done) louipc tardo xilon
It probably does make sense for folks to rebase off of the release repo at this point (http://git.mattal.com/aur), if they want their changes incorporated. There were substantial conflicts merging from everyone but eliott, and I am not sure how long it will take me to sort all of that out. If you want your stuff to get, please work on eliminating conflicts between your repos and mine; hopefully this will be a 1-time hassle and then we'll be into smooth sailing.
I will generally do my merging work on the subzero checkout, and push things pack to the public repo when I've sanity checked them. The upshot of this-- you can use the subzero url to effectively monitor the state of my testing branch. As we get close to a stable release, I'll probably switch subzero over to the stable tree, but I'll announce that when it happens.
- P
I think i fixed it on my end. Try pulling my master again and see if you still get conflicts.
Looks good now! Thanks. - P
participants (5)
-
Loui
-
nesl247
-
Paul Mattal
-
tardo
-
tardo＠nagi-fanboi.net