you can merge individual commits into a branch by doing `git cherry-pick <commit>`. This should suffice for you to create a branch you like (but do read more docs on git...)
On Wednesday, July 26, 2017 at 6:20:24 PM UTC+1, jhonrubia6 wrote: > > Finally I've found the error but I do not know how to unravel it so any > help will be welcome > I am working on ticket #22081, and in some commit (ea92d27) I made the > error of adding src/bin/sage-env-config file to the commit pushed. After > that I did some corrections on code (4851eed->bc476cd->9d94d5c) then I got > an error on trac as it was unable to merge (I didn't know yet my error on > the previous commit) so I did some merge commits > (aee6930->7199b81->787cf58). > Now what I would like to do is apply bc476cd and then 9d94d5c to the head > and nothing more, discarding the other commits. I do not know if it is even > possible. If not, how do I discard the src/bin/sage-env-config file (which > my settings) that is probably stopping trac to merge? > > thanks in advance > > El domingo, 16 de julio de 2017, 20:50:03 (UTC+2), jhonrubia6 escribió: >> >> >> >> El jueves, 6 de julio de 2017, 20:52:02 (UTC+2), François Bissey escribió: >>> >>> The OS X file system only fake case sensitivity, so “Sage” and “sage” >>> are actually the same folder. >>> >>> Now it is very suspicious. It fails because permission is denied on >>> > /Users/J_Honrubia/Sage/sage/local/var/lib/sage/installed >>> Yet you are t143730 and you are building from /Users/t143730/sage/ >>> so do you have symlinks to another user account for which you >>> don’t have permission with this user? >>> the symlink could be >>> local >>> local/var >>> local/var/lib >>> local/var/lib/sage >>> local/var/lib/sage/installed >>> >> >> >> No François, there is no J_Honrubia user on this machine and neither is a >> symlink on this subdirectories you suggested. Is there a target in the >> makefile to clean this mess :-) >> >> >>> >>> François >>> >>> > On 7/07/2017, at 05:35, jhonrubia6 <javier_...@hotmail.com> wrote: >>> > >>> > this is the complete log, somehow it is trying to create a S >>> > /Library/Developer/CommandLineTools/usr/bin/make build/make/Makefile >>> > >>> > make[1]: `build/make/Makefile' is up to date. >>> > >>> > build/bin/sage-logger \ >>> > >>> > "cd build/make && ./install 'all'" logs/install.log >>> > >>> > *** ALL ENVIRONMENT VARIABLES BEFORE BUILD: *** >>> > >>> > >>> Apple_PubSub_Socket_Render=/private/tmp/com.apple.launchd.wvo7zYEsAE/Render >>> > >>> > HOME=/Users/t143730 >>> > >>> > LANG=es_ES.UTF-8 >>> > >>> > LOGNAME=t143730 >>> > >>> > MAKE=make >>> > >>> > MAKEFLAGS= V=1 >>> > >>> > MAKELEVEL=1 >>> > >>> > MFLAGS= >>> > >>> > >>> PATH=/Users/t143730/sage/build/bin:/Users/t143730/sage/src/bin:/Users/t143730/sage/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/Library/TeX/texbin >>> >>> >>> > >>> > PWD=/Users/t143730/sage/build/make >>> > >>> > PYTHONPATH=/Users/t143730/sage/local >>> > >>> > SAGE_EXTCODE=/Users/t143730/sage/local/share/sage/ext >>> > >>> > SAGE_LOCAL=/Users/t143730/sage/local >>> > >>> > SAGE_LOGS=/Users/t143730/sage/logs/pkgs >>> > >>> > >>> SAGE_ORIG_PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/Library/TeX/texbin >>> >>> >>> > >>> > SAGE_ORIG_PATH_SET=True >>> > >>> > SAGE_ROOT=/Users/t143730/sage >>> > >>> > SAGE_SHARE=/Users/t143730/sage/local/share >>> > >>> > SAGE_SPKG_INST=/Users/t143730/sage/local/var/lib/sage/installed >>> > >>> > SAGE_SRC=/Users/t143730/sage/src >>> > >>> > SAGE_VERSION=8.0.beta4 >>> > >>> > SECURITYSESSIONID=186a7 >>> > >>> > SHELL=/bin/bash >>> > >>> > SHLVL=4 >>> > >>> > SSH_AUTH_SOCK=/private/tmp/com.apple.launchd.aggQsC0Rbq/Listeners >>> > >>> > TERM=xterm-256color >>> > >>> > TERM_PROGRAM=Apple_Terminal >>> > >>> > TERM_PROGRAM_VERSION=361.1 >>> > >>> > TERM_SESSION_ID=BA2F8976-A25B-4038-8F51-F0CCF658AD18 >>> > >>> > TMPDIR=/var/folders/jz/2g9tqjks4yz7b24v_z7qnjsc0000gn/T/ >>> > >>> > USER=t143730 >>> > >>> > XPC_FLAGS=0x0 >>> > >>> > XPC_SERVICE_NAME=0 >>> > >>> > _=/usr/bin/env >>> > >>> > __CF_USER_TEXT_ENCODING=0x1F5:0x0:0x8 >>> > >>> > *********************************************** >>> > >>> > make base >>> > >>> > make[2]: Nothing to be done for `base'. >>> > >>> > env SAGE_BUILD_TOOLCHAIN=yes make toolchain >>> > >>> > make[2]: Nothing to be done for `toolchain'. >>> > >>> > make toolchain-deps >>> > >>> > make /Users/t143730/sage/local/var/lib/sage/installed/zlib-1.2.8.p0 >>> > >>> > make[3]: >>> `/Users/t143730/sage/local/var/lib/sage/installed/zlib-1.2.8.p0' is up to >>> date. >>> > >>> > make /Users/t143730/sage/local/var/lib/sage/installed/mpir-2.7.2.p0 >>> > >>> > make[3]: >>> `/Users/t143730/sage/local/var/lib/sage/installed/mpir-2.7.2.p0' is up to >>> date. >>> > >>> > make /Users/t143730/sage/local/var/lib/sage/installed/mpfr-3.1.5 >>> > >>> > make[3]: `/Users/t143730/sage/local/var/lib/sage/installed/mpfr-3.1.5' >>> is up to date. >>> > >>> > make /Users/t143730/sage/local/var/lib/sage/installed/mpc-1.0.3.p0 >>> > >>> > make[3]: >>> `/Users/t143730/sage/local/var/lib/sage/installed/mpc-1.0.3.p0' is up to >>> date. >>> > >>> > make doc all-sage >>> > >>> > sage-logger -p 'sage-spkg ncurses-6.0' >>> '/Users/t143730/sage/logs/pkgs/ncurses-6.0.log' >>> > >>> > [ncurses-6.0] mkdir: >>> /Users/J_Honrubia/Sage/sage/local/var/lib/sage/installed: Permission denied >>> > >>> > [ncurses-6.0] >>> ************************************************************************ >>> > >>> > [ncurses-6.0] Error creating directory >>> /Users/J_Honrubia/Sage/sage/local/var/lib/sage/installed >>> > >>> > [ncurses-6.0] >>> ************************************************************************ >>> > >>> > [ncurses-6.0] Please email sage-devel ( >>> http://groups.google.com/group/sage-devel) >>> > >>> > [ncurses-6.0] explaining the problem and including the log file >>> > >>> > [ncurses-6.0] /Users/t143730/sage/logs/pkgs/.log >>> > >>> > [ncurses-6.0] Describe your computer, operating system, etc. >>> > >>> > [ncurses-6.0] >>> ************************************************************************ >>> > >>> > make[2]: *** >>> [/Users/t143730/sage/local/var/lib/sage/installed/ncurses-6.0] Error 1 >>> > >>> > make[1]: *** [all] Error 2 >>> > >>> > >>> > >>> > real 0m0.376s >>> > >>> > user 0m0.234s >>> > >>> > sys 0m0.113s >>> > >>> > *************************************************************** >>> > >>> > Error building Sage. >>> > >>> > >>> > >>> > The following package(s) may have failed to build (not necessarily >>> > >>> > during this run of 'make all'): >>> > >>> > >>> > >>> > * package: ncurses-6.0 >>> > >>> > log file: /Users/t143730/sage/logs/pkgs/ncurses-6.0.log >>> > >>> > build directory: >>> /Users/t143730/sage/local/var/tmp/sage/build/ncurses-6.0 >>> > >>> > >>> > >>> > The build directory may contain configuration files and other >>> potentially >>> > >>> > helpful information. WARNING: if you now run 'make' again, the build >>> > >>> > directory will, by default, be deleted. Set the environment variable >>> > >>> > SAGE_KEEP_BUILT_SPKGS to 'yes' to prevent this. >>> > >>> > >>> > >>> > make: *** [all] Error 1 >>> > >>> > >>> > And under /Users/t143730 there is no subdirectory named sage >>> > iMac-de-Javier:Sage t143730$ pwd >>> > >>> > /Users/t143730/Sage >>> > >>> > iMac-de-Javier:Sage t143730$ ls -l >>> > >>> > total 888 >>> > >>> > -rw-r--r-- 1 t143730 staff 70187 9 ene 15:36 COPYING.txt >>> > >>> > -rw-r--r-- 1 t143730 staff 4593 4 jul 21:31 Makefile >>> > >>> > -rw-r--r-- 1 t143730 staff 15204 4 jul 21:31 README.md >>> > >>> > -rw-r--r-- 1 t143730 staff 53 4 jul 21:31 VERSION.txt >>> > >>> > -rwxr-xr-x 1 t143730 staff 4022 4 jul 21:31 bootstrap >>> > >>> > drwxr-xr-x 11 t143730 staff 374 9 ene 15:36 build >>> > >>> > drwxr-xr-x 7 t143730 staff 238 4 jul 21:52 config >>> > >>> > lrwxr-xr-x 1 t143730 staff 20 6 jul 19:31 config.log -> >>> logs/pkgs/config.log >>> > >>> > -rwxr-xr-x 1 t143730 staff 31562 6 jul 19:31 config.status >>> > >>> > -rwxr-xr-x 1 t143730 staff 263914 4 jul 21:52 configure >>> > >>> > -rw-r--r-- 1 t143730 staff 36049 4 jul 21:31 configure.ac >>> > >>> > drwxr-xr-x 16 t143730 staff 544 18 abr 2016 git-trac-command >>> > >>> > drwxr-xr-x 13 t143730 staff 442 30 abr 12:03 local >>> > >>> > drwxr-xr-x 4 t143730 staff 136 6 jul 19:31 logs >>> > >>> > drwxr-xr-x 10 t143730 staff 340 9 mar 2016 m4 >>> > >>> > -rwxr-xr-x 1 t143730 staff 4756 4 jul 21:31 sage >>> > >>> > drwxr-xr-x 19 t143730 staff 646 6 jul 19:31 src >>> > >>> > drwxr-xr-x 295 t143730 staff 10030 9 may 19:18 upstream >>> > >>> > >>> > -- >>> > 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+...@googlegroups.com. >>> > To post to this group, send email to sage-...@googlegroups.com. >>> > Visit this group at https://groups.google.com/group/sage-devel. >>> > For more options, visit https://groups.google.com/d/optout. >>> >>> -- 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 https://groups.google.com/group/sage-devel. For more options, visit https://groups.google.com/d/optout.
