From abela at chalmers.se Fri Oct 13 11:57:09 2017 From: abela at chalmers.se (Andreas Abel) Date: Fri, 13 Oct 2017 11:57:09 +0200 Subject: [Agda-dev] travis fails for shelltestrunner installation on 7.8 Message-ID: <2c7ef46f-5db3-568f-9303-e9fe7f0360a1@chalmers.se> This build https://travis-ci.org/agda/agda/jobs/287287542 failed in a very late stage (testing the standalone size solver program): $ if [[ $TEST = "MAIN" ]]; then cabal install shelltestrunner && make test-size-solver; fi Resolving dependencies... Downloading Diff-0.3.2... Configuring Diff-0.3.2... /home/travis/.travis/job_stages: line 57: 10416 Segmentation fault (core dumped) cabal install shelltestrunner This is an inessential failure, but has anyone seen this before or is it a random glitch? Best, Anreas -- Andreas Abel <>< Du bist der geliebte Mensch. Department of Computer Science and Engineering Chalmers and Gothenburg University, Sweden andreas.abel at gu.se http://www.cse.chalmers.se/~abela/ From abela at chalmers.se Sat Oct 14 13:49:12 2017 From: abela at chalmers.se (Andreas Abel) Date: Sat, 14 Oct 2017 13:49:12 +0200 Subject: [Agda-dev] Please use rebase when adding to stable-2.5 Message-ID: <40fbc274-5378-ebc3-cf1b-021be79bd628@chalmers.se> When working on new patches for the stable branch, please use rebase instead of merge to pull new changes from the upstream stable branch. This way your patches will "swim on top" and stay together. When you are done, you can simply push to stable without creating a merge patch. (Finally, merging into master will of course create a merge patch.) For your working copy of the stable branch, set rebase = true in .git/config. Best, Andreas -- Andreas Abel <>< Du bist der geliebte Mensch. Department of Computer Science and Engineering Chalmers and Gothenburg University, Sweden andreas.abel at gu.se http://www.cse.chalmers.se/~abela/