On Thu, Jul 18, 2013 at 11:04 AM, Volker Braun <vbraun.n...@gmail.com>wrote:
> When I click on the branch (u/mmezzarobba/fix_micro_release) then I get a > 504 Gateway Time-Out. It seems that the three-way diff doesn't like that > old == base: > > Timeout: > > > http://trac.sagemath.org/changeset?new=a13a04286b549bfd3e7b9c99d87b5ec8c8ab5b6d&base=5d8b2ff4794c44c7fa7a9d86ec567ecfa337e566&old=5d8b2ff4794c44c7fa7a9d86ec567ecfa337e566 > > Works: > > > http://trac.sagemath.org/changeset?new=a13a04286b549bfd3e7b9c99d87b5ec8c8ab5b6d&old=2d565a2b90b11cb921a44fc97688b39014cc99ff&base=5d8b2ff4794c44c7fa7a9d86ec567ecfa337e566 > The timeout is actually because it is trying to display a ~340kB diff, since this branch includes all of the changes to the build system, which haven't yet been merged into master. Ideally, we would have a diff against the dependencies, but doing that would be much more complicated than what I've implemented and would require writing temporary commits to the repository (which currently I'm avoiding). -- Andrew -- You received this message because you are subscribed to the Google Groups "sage-devel" group. To unsubscribe from this group and stop receiving emails from it, send an email to sage-devel+unsubscr...@googlegroups.com. To post to this group, send email to sage-devel@googlegroups.com. Visit this group at http://groups.google.com/group/sage-devel. For more options, visit https://groups.google.com/groups/opt_out.