On Jul 24, 7:37 pm, Aymeric Augustin <aymeric.augus...@polytechnique.org> wrote:
> Since Django's test suite isn't exhaustive, we focus on code review rather > than passing tests to validate the > changes. That's why we're doing them step by step rather than in a huge > merge. We're coordinating this effort > on the #django-dev IRC channel. Sure. The test results are just one metric, which one might class as "necessary but not sufficient". There are numerous places where things IMO aren't done correctly in the main Django repo: for example, using BytesIO in some places where StringIO should be used, and using b prefixes a little too liberally (for example, if you use a b prefix for a class name when constructing a type, it will fail on Python 3.x). If you think it would be helpful for me to be available on #django- dev, I can try to do that more often. > Of course, I'm frequently looking at your branch to see how you've resolved > the various problems. It would be > very useful to view the entire diff between your branch and master. > Unfortunately I couldn't figure out how to do > this on GitHub. The "Files changed" tab > onhttps://github.com/vsajip/django/compare/django3shows a lot of > differences in AUTHORS that I wouldn't expect to find there. Any idea? I've not intentionally made any changes to AUTHORS. I started working with Git the way one is supposed to, but I've found that for some reason, every time I do a merge with master, the same conflicts keep coming up again and again, even if they were resolved in previous merges; this makes it hard for me to use Git to keep my branch synchronised with changes in the upstream repo. I mentioned this to Claude a while ago, but I haven't been able to find out why I have so much trouble. (I've tried both fast-forward and no fast-forward options when merging). Possibly something went wrong in one of my merges, but AFAIK the AUTHORS file should be identical. I actually keep 3 repos around: django-upstream, which I never touch but just pull from the main Django repo, then my repo which I use to publish my changes, and another Mercurial repo which I use for help with merging due to the aforementioned problems with Git merging. I just checked: if I run meld to compare django-upstream and my Django repo, I see no changes in the top-level directory other than in setup.py (which IIRC are changes Martin von Löwis made a long while ago to patch sysconfig in 2.7 / 3.2). I've found in the past that diff UIs are not completely reliable due to how they parse line endings (by which I mean Windows/Mac/Linux). Also, the diff is pretty big, so it may push the diff-determining code into less well tested areas. So I use meld, which hasn't let me down :-) Regards, Vinay Sajip -- You received this message because you are subscribed to the Google Groups "Django developers" group. To post to this group, send email to django-developers@googlegroups.com. To unsubscribe from this group, send email to django-developers+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/django-developers?hl=en.
