Am 17.04.2015 um 16:55 schrieb davecortesi: > The Python3 branch is, alas, far behind the Develop branch. The branch > was created about a year ago. I just looked at a merge and there are > ~350 commits separating them, many showing conflicts in the display > presented by the "github for mac" tool. There should not be such a > huge number of conflicts with the actual Python3/ModuleGraph code, > which is fairly well confined to a couple of files, but that's what > the tool showed me.
I found some time investigating this: 1) Rebasing on branch on the other is not an option IMHO: Rebasing python3 on develop would start at 1156501, but develop has already been merges in later commits. 2) Merging develop into python3 gives 99 conflicts. This sounds a lot, but as far as I've seen, most of them are trivial, e.g. changed `except`-syntax or renamed files. I assume, resolving them takes one (full) day of work. So I'm heading for merging develop into python3. Hopefully I'll find time doing this next week. -- Schönen Gruß Hartmut Goebel Dipl.-Informatiker (univ), CISSP, CSSLP Information Security Management, Security Governance, Secure Software Development Goebel Consult, Landshut http://www.goebel-consult.de Blog: http://www.goebel-consult.de/blog/tr-069-auf-fritzbox-ausschalten-und-ergebnis-prufen Kolumne: http://www.cissp-gefluester.de/2010-11-it-sicherheit-im-unternehmen-eine-interne-oder-externe-angelegenheit -- You received this message because you are subscribed to the Google Groups "PyInstaller" group. To unsubscribe from this group and stop receiving emails from it, send an email to pyinstaller+unsubscr...@googlegroups.com. To post to this group, send email to pyinstaller@googlegroups.com. Visit this group at http://groups.google.com/group/pyinstaller. For more options, visit https://groups.google.com/d/optout.
smime.p7s
Description: S/MIME Cryptographic Signature
