The following problem occurs while running make CPUS=4 in the plt repository.
error: 'merge' is not possible because you have unmerged files. And that's confusing, because git status doesn't report anything. mba-5:plt soegaard$ git status On branch master Your branch is up-to-date with 'origin/master'. Untracked files: (use "git add <file>..." to include in what will be committed) The full transcript is below. Here is what I did to get in this state. 1. Updated and built the racket repository 2. Create a new directory ~/clones/ and cloned github.org/racket/gui 3. Added the cloned gui libs to with raco 4. Changed things 5. Built racket with modified gui in clones. 5. Removed the clones with raco link -r <path> 6. Updated the repository with git pull 7. Tried make. So there are unmerged files in ~/clones/... but they are no longer linked to. > ~/racket-from-plt-git/plt/racket/bin/raco link -l | grep clone > /Jens Axel mba-5:plt soegaard$ make CPUS=4 if [ "4" = "" ] ; \ then make plain-in-place PKGS="main-distribution main-distribution-test" ; \ else make cpus-in-place CPUS="4" PKGS="main-distribution main-distribution-test" ; fi make -j 4 plain-in-place JOB_OPTIONS="-j 4" PKGS="main-distribution main-distribution-test" make base mkdir -p build/config echo '#hash((links-search-files . ()))' > build/config/config.rktd mkdir -p racket/src/build make racket/src/build/Makefile make[4]: `racket/src/build/Makefile' is up to date. cd racket/src/build; make reconfigure make Makefile make[5]: `Makefile' is up to date. cd racket/src/build; make SELF_RACKET_FLAGS="-G `cd ../../../build/config; pwd`" make 3m cd racket; make 3m make cgc make common make g-c cd sgc; make ../libmzgc.a make[10]: `../libmzgc.a' is up to date. make foreign-stuff cd ../foreign; make all make foreign.o make[11]: `foreign.o' is up to date. make libffi_ON make libffi/libffi.la make[12]: `libffi/libffi.la' is up to date. make dynlib cd dynsrc; make dynlib make ../mzdyn.o make[10]: `../mzdyn.o' is up to date. make ../starter make[10]: `../starter' is up to date. make mzlibrary cd src; make all make mzobjects make[10]: Nothing to be done for `mzobjects'. make libracket.a make[9]: `libracket.a' is up to date. make racketcgc make[8]: `racketcgc' is up to date. cd gc2; make all make check-sdep ../racketcgc -G /Users/soegaard/racket-from-plt-git/plt/build/config -cqu ../../../racket/gc2/check-sdep.rkt make xsrc/precomp.h make[8]: `xsrc/precomp.h' is up to date. make xobjects make[8]: Nothing to be done for `xobjects'. make ../racket3m make[8]: `../racket3m' is up to date. cd dynsrc; make dynlib3m make ../mzdyn3m.o make[8]: `../mzdyn3m.o' is up to date. cd gc2; make ../racket3m make[7]: `../racket3m' is up to date. make gracket-3m cd gracket; make 3m make resources : cd gc2; make 3m make ../gracket3m make ../GRacket3m.app/Contents/MacOS/GRacket3m make[10]: `../GRacket3m.app/Contents/MacOS/GRacket3m' is up to date. cd racket/src/build; make install SELF_RACKET_FLAGS="-G `cd ../../../build/config; pwd`" PLT_SETUP_OPTIONS="-j 4 " make install-3m make install-3m-common make install-common-first mkdir -p "/Users/soegaard/racket-from-plt-git/plt/racket/bin" "/Users/soegaard/racket-from-plt-git/plt/racket/collects" "/Users/soegaard/racket-from-plt-git/plt/racket/doc" "/Users/soegaard/racket-from-plt-git/plt/racket/lib" "/Users/soegaard/racket-from-plt-git/plt/racket/include" "/Users/soegaard/racket-from-plt-git/plt/racket/lib" "/Users/soegaard/racket-from-plt-git/plt/racket/share" "/Users/soegaard/racket-from-plt-git/plt/racket/etc" "/Users/soegaard/racket-from-plt-git/plt/racket/share/applications" "/Users/soegaard/racket-from-plt-git/plt/racket/man" cd racket; make install-3m make headers ./racketcgc -cqu ../../racket/mkincludes.rkt "/Users/soegaard/racket-from-plt-git/plt/racket/include" "../../racket" . Making /Users/soegaard/racket-from-plt-git/plt/racket/include Done. make osx-install make unix-install cd ..; rm -f "/Users/soegaard/racket-from-plt-git/plt/racket/bin/racketcgc" cd ..; rm -f "/Users/soegaard/racket-from-plt-git/plt/racket/bin/racket" cd ..; cp racket/starter "/Users/soegaard/racket-from-plt-git/plt/racket/lib/starter" cp ../../racket/dynsrc/starter-sh . cd ..; cp racket/starter-sh "/Users/soegaard/racket-from-plt-git/plt/racket/lib/starter-sh" cd ..; strip "/Users/soegaard/racket-from-plt-git/plt/racket/lib/starter" ./racketcgc -cu "../../racket/collects-path.rkt" "/Users/soegaard/racket-from-plt-git/plt/racket/lib/starter" ../collects ../etc cd ..; echo 'CC=gcc' > "/Users/soegaard/racket-from-plt-git/plt/racket/lib/buildinfo" cd ..; echo 'CFLAGS=-g -O2 -Wall -DOS_X -D_DARWIN_UNLIMITED_SELECT -pthread' >> "/Users/soegaard/racket-from-plt-git/plt/racket/lib/buildinfo" cd ..; echo 'OPTIONS= -fno-common -DUSE_SENORA_GC' >> "/Users/soegaard/racket-from-plt-git/plt/racket/lib/buildinfo" cd ..; echo 'MZOPTIONS=' >> "/Users/soegaard/racket-from-plt-git/plt/racket/lib/buildinfo" cd ..; echo "LDFLAGS= -pthread" >> "/Users/soegaard/racket-from-plt-git/plt/racket/lib/buildinfo" cd ..; echo 'LIBS=-ldl -lm -liconv ' >> "/Users/soegaard/racket-from-plt-git/plt/racket/lib/buildinfo" rm -f /Users/soegaard/racket-from-plt-git/plt/racket/lib/Racket.framework/Racket rm -rf /Users/soegaard/racket-from-plt-git/plt/racket/lib/Racket.framework/Versions/6.1.1.6 rm -rf /Users/soegaard/racket-from-plt-git/plt/racket/lib/Racket.framework/Versions/6.1.1.6_3m if [ yes = yes ] ; then rm -rf /Users/soegaard/racket-from-plt-git/plt/racket/lib/Racket.framework ; fi mkdir -p /Users/soegaard/racket-from-plt-git/plt/racket/lib make osx-install-3m make unix-install-3m cd ..; cp racket/racket3m "/Users/soegaard/racket-from-plt-git/plt/racket/bin/racket" cd ..; strip "/Users/soegaard/racket-from-plt-git/plt/racket/bin/racket" make unix-no-install-libs-3m : cd ..; cp racket/mzdyn3m.o "/Users/soegaard/racket-from-plt-git/plt/racket/lib/mzdyn3m.o" ./racket3m -cu "../../racket/collects-path.rkt" "/Users/soegaard/racket-from-plt-git/plt/racket/bin/racket" ../collects ../etc mkdir -p "/Users/soegaard/racket-from-plt-git/plt/racket/lib/Racket.framework/Versions/6.1.1.6_3m" cp Racket.framework/Versions/6.1.1.6_3m/Racket /Users/soegaard/racket-from-plt-git/plt/racket/lib/Racket.framework/Versions/6.1.1.6_3m/ /usr/bin/install_name_tool -change "@executable_path/Racket.framework/Versions/6.1.1.6_3m/Racket" ""@executable_path/../lib/"Racket.framework/Versions/6.1.1.6_3m/Racket" "/Users/soegaard/racket-from-plt-git/plt/racket/bin/racket" strip "/Users/soegaard/racket-from-plt-git/plt/racket/bin/racket" make osx-install-3m-final make unix-install-3m-final : ln -s Versions/6.1.1.6_3m/Racket /Users/soegaard/racket-from-plt-git/plt/racket/lib/Racket.framework/ make install-gracket-3m cd gracket; make install-3m make install-wx_mac make install-common : cd ..; rm -rf "/Users/soegaard/racket-from-plt-git/plt/racket/lib/GRacketCGC.app" cd ..; rm -rf "/Users/soegaard/racket-from-plt-git/plt/racket/lib/GRacket.app" make install-wx_mac-3m cd ..; cp -r "gracket/GRacket3m.app" "/Users/soegaard/racket-from-plt-git/plt/racket/lib/GRacket.app" ../racket/racket3m -G /Users/soegaard/racket-from-plt-git/plt/build/config -cqu "../../gracket/../mac/rename-app.rkt" "/Users/soegaard/racket-from-plt-git/plt/racket/lib/GRacket.app" "GRacket3m" "GRacket" /usr/bin/install_name_tool -change "@executable_path/../../../../racket/Racket.framework/Versions/6.1.1.6_3m/Racket" ""@executable_path/../../../"Racket.framework/Versions/6.1.1.6_3m/Racket" "/Users/soegaard/racket-from-plt-git/plt/racket/lib/GRacket.app/Contents/MacOS/GRacket" ../racket/racket3m -G /Users/soegaard/racket-from-plt-git/plt/build/config -cu "../../gracket/../racket/collects-path.rkt" "/Users/soegaard/racket-from-plt-git/plt/racket/lib/GRacket.app/Contents/MacOS/GRacket" "../../../../collects" ../../../../etc strip "/Users/soegaard/racket-from-plt-git/plt/racket/lib/GRacket.app/Contents/MacOS/GRacket" make install-wx_mac-3m-final : make install-common-middle make no-run : make install-gracket-post-collects cd gracket; make install-post-collects make install-wx_mac-post-collects cd ..; rm -rf /Users/soegaard/racket-from-plt-git/plt/racket/lib/Starter.app cd ..; cp -r gracket/Starter.app /Users/soegaard/racket-from-plt-git/plt/racket/lib/. make lib-finish if [ "" = "" ]; then \ echo "/Users/soegaard/racket-from-plt-git/plt/racket/lib"; \ fi /Users/soegaard/racket-from-plt-git/plt/racket/lib racket/racket3m -X "/Users/soegaard/racket-from-plt-git/plt/racket/collects" -G "/Users/soegaard/racket-from-plt-git/plt/racket/etc" -G /Users/soegaard/racket-from-plt-git/plt/build/config -N "raco" -l- setup --no-user -j 4 raco setup: version: 6.1.1.6 [3m] raco setup: installation name: 6.1.1.6 raco setup: variants: 3m raco setup: main collects: /Users/soegaard/racket-from-plt-git/plt/racket/collects raco setup: collects paths: raco setup: /Users/soegaard/racket-from-plt-git/plt/racket/collects raco setup: main pkgs: /Users/soegaard/racket-from-plt-git/plt/racket/share/pkgs raco setup: pkgs paths: raco setup: /Users/soegaard/racket-from-plt-git/plt/racket/share/pkgs raco setup: /Users/soegaard/Library/Racket/6.1.1.6/pkgs raco setup: links files: raco setup: /Users/soegaard/Library/Racket/6.1.1.6/links.rktd raco setup: main docs: /Users/soegaard/racket-from-plt-git/plt/racket/doc raco setup: --- updating info-domain tables --- raco setup: --- pre-installing collections --- raco setup: --- installing foreign libraries --- raco setup: --- installing shared files --- raco setup: --- compiling collections --- raco setup: making: <collects>/racket raco setup: --- parallel build using 4 jobs --- raco setup: 3 making: <collects>/compiler raco setup: 2 making: <collects>/raco raco setup: 1 making: <collects>/racket raco setup: 0 making: <collects>/acks raco setup: 0 making: <collects>/data raco setup: 3 making: <collects>/compiler/private raco setup: 3 making: <collects>/db raco setup: 3 making: <collects>/db/private raco setup: 3 making: <collects>/db/private/generic raco setup: 3 making: <collects>/db/private/sqlite3 raco setup: 3 making: <collects>/dynext raco setup: 3 making: <collects>/ffi raco setup: 0 making: <collects>/data/private raco setup: 2 making: <collects>/file raco setup: 0 making: <collects>/info raco setup: 3 making: <collects>/ffi/unsafe raco setup: 0 making: <collects>/info-domain raco setup: 0 making: <collects>/json raco setup: 0 making: <collects>/launcher raco setup: 3 making: <collects>/ffi/unsafe/private raco setup: 0 making: <collects>/net raco setup: 2 making: <collects>/file/private raco setup: 3 making: <collects>/openssl raco setup: 2 making: <collects>/pkg raco setup: 3 making: <collects>/openssl/private raco setup: 3 making: <collects>/planet raco setup: 3 making: <collects>/planet/private raco setup: 0 making: <collects>/reader raco setup: 0 making: <collects>/reader/lang raco setup: 0 making: <collects>/realm raco setup: 0 making: <collects>/s-exp raco setup: 0 making: <collects>/s-exp/lang raco setup: 0 making: <collects>/setup raco setup: 3 making: <collects>/syntax raco setup: 3 making: <collects>/syntax/parse raco setup: 3 making: <collects>/syntax/parse/experimental raco setup: 2 making: <collects>/pkg/private raco setup: 3 making: <collects>/syntax/parse/experimental/private raco setup: 1 making: <collects>/racket/base raco setup: 3 making: <collects>/syntax/parse/private raco setup: 1 making: <collects>/racket/base/lang raco setup: 1 making: <collects>/racket/contract raco setup: 1 making: <collects>/racket/contract/private raco setup: 0 making: <collects>/setup/commands raco setup: 0 making: <collects>/setup/infotab raco setup: 0 making: <collects>/setup/infotab/lang raco setup: 0 making: <collects>/setup/private raco setup: 0 making: <collects>/unstable raco setup: 2 making: <collects>/version raco setup: 3 making: <collects>/syntax/private raco setup: 0 making: <collects>/xml raco setup: 0 making: <collects>/xml/private raco setup: 3 making: <collects>/syntax/private/util raco setup: 3 making: <collects>/syntax/unsafe raco setup: 1 making: <collects>/racket/gui raco setup: 1 making: <collects>/racket/kernel raco setup: 1 making: <collects>/racket/lang raco setup: 1 making: <collects>/racket/load raco setup: 1 making: <collects>/racket/load/lang raco setup: 1 making: <collects>/racket/match raco setup: 1 making: <collects>/racket/place raco setup: 1 making: <collects>/racket/place/private raco setup: 1 making: <collects>/racket/private raco setup: 1 making: <collects>/racket/signature raco setup: 1 making: <collects>/racket/signature/lang raco setup: 1 making: <collects>/racket/unit raco setup: 1 making: <collects>/racket/unit/lang raco setup: 1 making: <collects>/racket/unsafe raco setup: --- creating launchers --- raco setup: launcher: <console-bin>/raco raco setup: --- installing man pages --- raco setup: --- installing collections --- raco setup: --- post-installing collections --- raco setup: --- checking package dependencies --- make install-common-last make fix-paths if [ "" != "" ]; then \ if [ "" = "" ]; then \ racket/racketcgc -G /Users/soegaard/racket-from-plt-git/plt/build/config -u \ "../../collects/setup/unixstyle-install.rkt" \ make-install-destdir-fix "../.." \ "/Users/soegaard/racket-from-plt-git/plt/racket/bin" "/Users/soegaard/racket-from-plt-git/plt/racket/collects" "/Users/soegaard/racket-from-plt-git/plt/racket/doc" "/Users/soegaard/racket-from-plt-git/plt/racket/lib" "/Users/soegaard/racket-from-plt-git/plt/racket/include" "/Users/soegaard/racket-from-plt-git/plt/racket/lib" "/Users/soegaard/racket-from-plt-git/plt/racket/share" "/Users/soegaard/racket-from-plt-git/plt/racket/etc" "/Users/soegaard/racket-from-plt-git/plt/racket/share/applications" "/Users/soegaard/racket-from-plt-git/plt/racket/man" "yes"; \ fi \ fi make preserve-raco-pkg-default-scope : cp "../COPYING-libscheme.txt" "../COPYING_LESSER.txt" "../COPYING.txt" "/Users/soegaard/racket-from-plt-git/plt/racket/share"/ make pkgs-catalog racket/bin/racket -U -G build/config -l- pkg/dirs-catalog --link --check-metadata racket/share/pkgs-catalog pkgs Finding packages racket/bin/racket -U -G build/config racket/src/pkgs-config.rkt racket/bin/racket racket/src/pkgs-check.rkt racket/share/pkgs-catalog Package links are in sync racket/bin/racket -N raco -l- raco pkg update --all --auto --no-setup --scope installation Resolving "db" via http://pkgs.racket-lang.org Resolving "db-lib" via http://pkgs.racket-lang.org Resolving "srfi-lite-lib" via http://pkgs.racket-lang.org Resolving "db-doc" via http://pkgs.racket-lang.org Resolving "data-doc" via http://pkgs.racket-lang.org Resolving "data-lib" via http://pkgs.racket-lang.org Resolving "rackunit-lib" via http://pkgs.racket-lang.org Resolving "data-enumerate-lib" via http://pkgs.racket-lang.org Resolving "math-lib" via http://pkgs.racket-lang.org Resolving "r6rs-lib" via http://pkgs.racket-lang.org Resolving "scheme-lib" via http://pkgs.racket-lang.org Resolving "r5rs-lib" via http://pkgs.racket-lang.org Resolving "compatibility-lib" via http://pkgs.racket-lang.org Resolving "net-lib" via http://pkgs.racket-lang.org Resolving "sandbox-lib" via http://pkgs.racket-lang.org Resolving "errortrace-lib" via http://pkgs.racket-lang.org Resolving "source-syntax" via http://pkgs.racket-lang.org Resolving "typed-racket-lib" via http://pkgs.racket-lang.org Resolving "typed-racket-more" via http://pkgs.racket-lang.org Resolving "math-x86_64-macosx" via http://pkgs.racket-lang.org Resolving "scribble-lib" via http://pkgs.racket-lang.org Resolving "rackunit-doc" via http://pkgs.racket-lang.org Resolving "rackunit-gui" via http://pkgs.racket-lang.org Querying Git references for gui-lib at git://github.com/racket/gui/?path=gui-lib Resolving "unstable-list-lib" via http://pkgs.racket-lang.org Resolving "compatibility" via http://pkgs.racket-lang.org Resolving "compatibility-doc" via http://pkgs.racket-lang.org Resolving "pconvert-lib" via http://pkgs.racket-lang.org Resolving "compiler-lib" via http://pkgs.racket-lang.org Resolving "zo-lib" via http://pkgs.racket-lang.org Querying Git references for gui-lib at git://github.com/racket/gui/?path=gui-lib Resolving "mzscheme-doc" via http://pkgs.racket-lang.org Resolving "r5rs-doc" via http://pkgs.racket-lang.org Resolving "errortrace-doc" via http://pkgs.racket-lang.org Resolving "typed-racket-doc" via http://pkgs.racket-lang.org Resolving "web-server-doc" via http://pkgs.racket-lang.org Resolving "net-doc" via http://pkgs.racket-lang.org Resolving "unstable-contract-lib" via http://pkgs.racket-lang.org Resolving "unstable-doc" via http://pkgs.racket-lang.org Resolving "draw-lib" via http://pkgs.racket-lang.org Resolving "draw-x86_64-macosx-2" via http://pkgs.racket-lang.org Querying Git references for gui-lib at git://github.com/racket/gui/?path=gui-lib Resolving "pict-lib" via http://pkgs.racket-lang.org Resolving "slideshow-lib" via http://pkgs.racket-lang.org Querying Git references for gui-lib at git://github.com/racket/gui/?path=gui-lib Resolving "unstable-debug-lib" via http://pkgs.racket-lang.org Resolving "unstable-pretty-lib" via http://pkgs.racket-lang.org Resolving "unstable-lib" via http://pkgs.racket-lang.org Querying Git references for gui-lib at git://github.com/racket/gui/?path=gui-lib Resolving "unstable-macro-testing-lib" via http://pkgs.racket-lang.org Resolving "unstable-options-lib" via http://pkgs.racket-lang.org Resolving "unstable-parameter-group-lib" via http://pkgs.racket-lang.org Resolving "unstable-2d" via http://pkgs.racket-lang.org Resolving "syntax-color-lib" via http://pkgs.racket-lang.org Resolving "parser-tools-lib" via http://pkgs.racket-lang.org Resolving "draw-doc" via http://pkgs.racket-lang.org Querying Git references for gui-doc at git://github.com/racket/gui/?path=gui-doc Resolving "pict-doc" via http://pkgs.racket-lang.org Querying Git references for gui-doc at git://github.com/racket/gui/?path=gui-doc Resolving "slideshow-doc" via http://pkgs.racket-lang.org Querying Git references for gui-doc at git://github.com/racket/gui/?path=gui-doc Resolving "scribble-doc" via http://pkgs.racket-lang.org Querying Git references for gui-lib at git://github.com/racket/gui/?path=gui-lib Querying Git references for gui-lib at git://github.com/racket/gui/?path=gui-lib Querying Git references for gui-lib at git://github.com/racket/gui/?path=gui-lib Querying Git references for gui-doc at git://github.com/racket/gui/?path=gui-doc Resolving "web-server-lib" via http://pkgs.racket-lang.org Resolving "scribble-text-lib" via http://pkgs.racket-lang.org Querying Git references for gui at git://github.com/racket/gui/?path=gui Resolving "draw" via http://pkgs.racket-lang.org Resolving "pict" via http://pkgs.racket-lang.org Resolving "parser-tools-doc" via http://pkgs.racket-lang.org Resolving "syntax-color-doc" via http://pkgs.racket-lang.org Querying Git references for gui-doc at git://github.com/racket/gui/?path=gui-doc Querying Git references for gui-lib at git://github.com/racket/gui/?path=gui-lib Resolving "r6rs-doc" via http://pkgs.racket-lang.org Resolving "xrepl" via http://pkgs.racket-lang.org Resolving "xrepl-lib" via http://pkgs.racket-lang.org Resolving "readline-lib" via http://pkgs.racket-lang.org Resolving "xrepl-doc" via http://pkgs.racket-lang.org Resolving "macro-debugger" via http://pkgs.racket-lang.org Querying Git references for gui-lib at git://github.com/racket/gui/?path=gui-lib Resolving "images-lib" via http://pkgs.racket-lang.org Resolving "unstable-latent-contract-lib" via http://pkgs.racket-lang.org Resolving "images-gui-lib" via http://pkgs.racket-lang.org Querying Git references for gui-lib at git://github.com/racket/gui/?path=gui-lib Resolving "string-constants-lib" via http://pkgs.racket-lang.org Resolving "macro-debugger-text-lib" via http://pkgs.racket-lang.org Resolving "profile-doc" via http://pkgs.racket-lang.org Resolving "profile-lib" via http://pkgs.racket-lang.org Resolving "readline-doc" via http://pkgs.racket-lang.org Resolving "readline" via http://pkgs.racket-lang.org Resolving "syntax-color" via http://pkgs.racket-lang.org Resolving "future-visualizer" via http://pkgs.racket-lang.org Querying Git references for gui-lib at git://github.com/racket/gui/?path=gui-lib Resolving "distributed-places" via http://pkgs.racket-lang.org Resolving "distributed-places-lib" via http://pkgs.racket-lang.org Resolving "distributed-places-doc" via http://pkgs.racket-lang.org Resolving "serialize-cstruct-lib" via http://pkgs.racket-lang.org Resolving "cext-lib" via http://pkgs.racket-lang.org Resolving "dynext-lib" via http://pkgs.racket-lang.org Resolving "planet-doc" via http://pkgs.racket-lang.org Resolving "planet-lib" via http://pkgs.racket-lang.org Querying Git references for gui at git://github.com/racket/gui/?path=gui Resolving "sgl" via http://pkgs.racket-lang.org Querying Git references for gui-lib at git://github.com/racket/gui/?path=gui-lib Querying Git references for gui-doc at git://github.com/racket/gui/?path=gui-doc Resolving "net" via http://pkgs.racket-lang.org Resolving "data" via http://pkgs.racket-lang.org Resolving "wxme" via http://pkgs.racket-lang.org Resolving "wxme-lib" via http://pkgs.racket-lang.org Resolving "snip-lib" via http://pkgs.racket-lang.org Querying Git references for gui-doc at git://github.com/racket/gui/?path=gui-doc Resolving "make" via http://pkgs.racket-lang.org Resolving "math" via http://pkgs.racket-lang.org Resolving "math-doc" via http://pkgs.racket-lang.org Resolving "plot-doc" via http://pkgs.racket-lang.org Resolving "plot-gui-lib" via http://pkgs.racket-lang.org Resolving "srfi" via http://pkgs.racket-lang.org Resolving "plai" via http://pkgs.racket-lang.org Querying Git references for gui-lib at git://github.com/racket/gui/?path=gui-lib Resolving "eli-tester" via http://pkgs.racket-lang.org Resolving "snip" via http://pkgs.racket-lang.org Querying Git references for gui-doc at git://github.com/racket/gui/?path=gui-doc Resolving "htdp" via http://pkgs.racket-lang.org Resolving "eopl" via http://pkgs.racket-lang.org Resolving "html" via http://pkgs.racket-lang.org Resolving "html-lib" via http://pkgs.racket-lang.org Resolving "html-doc" via http://pkgs.racket-lang.org Resolving "yaml" via http://pkgs.racket-lang.org Resolving "r5rs" via http://pkgs.racket-lang.org Resolving "r6rs" via http://pkgs.racket-lang.org Resolving "plot" via http://pkgs.racket-lang.org Resolving "lazy" via http://pkgs.racket-lang.org Resolving "drracket-plugin-lib" via http://pkgs.racket-lang.org Resolving "htdp-lib" via http://pkgs.racket-lang.org Querying GitHub branches for PyonR Resolving "trace" via http://pkgs.racket-lang.org Resolving "mzcom" via http://pkgs.racket-lang.org Resolving "mysterx" via http://pkgs.racket-lang.org Resolving "realm" via http://pkgs.racket-lang.org Resolving "games" via http://pkgs.racket-lang.org Resolving "drracket" via http://pkgs.racket-lang.org Querying Git references for gui-lib at git://github.com/racket/gui/?path=gui-lib Resolving "icons" via http://pkgs.racket-lang.org Querying Git references for tex-table at git://github.com/racket/gui/?path=tex-table Resolving "gui-pkg-manager-lib" via http://pkgs.racket-lang.org Querying Git references for gui-lib at git://github.com/racket/gui/?path=gui-lib Resolving "drracket-tool-lib" via http://pkgs.racket-lang.org Querying Git references for gui-lib at git://github.com/racket/gui/?path=gui-lib Resolving "drracket-tool-doc" via http://pkgs.racket-lang.org Querying Git references for gui-doc at git://github.com/racket/gui/?path=gui-doc Querying Git references for gui-lib at git://github.com/racket/gui/?path=gui-lib Resolving "string-constants-doc" via http://pkgs.racket-lang.org Querying Git references for gui-doc at git://github.com/racket/gui/?path=gui-doc Querying Git references for gui-lib at git://github.com/racket/gui/?path=gui-lib Resolving "srfi-lib" via http://pkgs.racket-lang.org Querying Git references for gui-doc at git://github.com/racket/gui/?path=gui-doc Resolving "htdp-doc" via http://pkgs.racket-lang.org Resolving "table-panel" via http://pkgs.racket-lang.org Querying Git references for gui at git://github.com/racket/gui/?path=gui Resolving "redex" via http://pkgs.racket-lang.org Resolving "srfi-doc" via http://pkgs.racket-lang.org Resolving "string-constants" via http://pkgs.racket-lang.org Resolving "scribble" via http://pkgs.racket-lang.org Resolving "unstable" via http://pkgs.racket-lang.org Resolving "algol60" via http://pkgs.racket-lang.org Querying Git references for gui-lib at git://github.com/racket/gui/?path=gui-lib Resolving "scribble-html-lib" via http://pkgs.racket-lang.org Resolving "plot-lib" via http://pkgs.racket-lang.org Resolving "data-test" via http://pkgs.racket-lang.org Resolving "plot-test" via http://pkgs.racket-lang.org Resolving "math-test" via http://pkgs.racket-lang.org Resolving "net-test" via http://pkgs.racket-lang.org Resolving "unstable-flonum-lib" via http://pkgs.racket-lang.org Resolving "srfi-test" via http://pkgs.racket-lang.org Resolving "htdp-test" via http://pkgs.racket-lang.org Resolving "r6rs-test" via http://pkgs.racket-lang.org Resolving "html-test" via http://pkgs.racket-lang.org Resolving "redex-lib" via http://pkgs.racket-lang.org Resolving "preprocessor" via http://pkgs.racket-lang.org Resolving "compiler" via http://pkgs.racket-lang.org Resolving "syntax-color-test" via http://pkgs.racket-lang.org Resolving "picturing-programs" via http://pkgs.racket-lang.org Querying Git references for gui-lib at git://github.com/racket/gui/?path=gui-lib Resolving "planet-test" via http://pkgs.racket-lang.org Resolving "rackunit" via http://pkgs.racket-lang.org Resolving "rackunit-plugin-lib" via http://pkgs.racket-lang.org Querying Git references for gui-lib at git://github.com/racket/gui/?path=gui-lib Resolving "profile-test" via http://pkgs.racket-lang.org Resolving "web-server-test" via http://pkgs.racket-lang.org Resolving "mzscheme" via http://pkgs.racket-lang.org Resolving "mzscheme-lib" via http://pkgs.racket-lang.org Resolving "spreadsheet-editor" via http://pkgs.racket-lang.org Querying Git references for gui at git://github.com/racket/gui/?path=gui Resolving "plot-compat" via http://pkgs.racket-lang.org Resolving "main-distribution-test" via http://pkgs.racket-lang.org Resolving "rackunit-test" via http://pkgs.racket-lang.org Querying Git references for gui-test at git://github.com/racket/gui/?path=gui-test Resolving "db-test" via http://pkgs.racket-lang.org Resolving "redex-test" via http://pkgs.racket-lang.org Resolving "drracket-test" via http://pkgs.racket-lang.org Querying Git references for gui-lib at git://github.com/racket/gui/?path=gui-lib Resolving "errortrace-test" via http://pkgs.racket-lang.org Resolving "typed-racket-test" via http://pkgs.racket-lang.org Resolving "xrepl-test" via http://pkgs.racket-lang.org Resolving "scribble-test" via http://pkgs.racket-lang.org Resolving "unstable-test" via http://pkgs.racket-lang.org Querying Git references for gui-lib at git://github.com/racket/gui/?path=gui-lib Resolving "compiler-test" via http://pkgs.racket-lang.org Querying Git references for gui-lib at git://github.com/racket/gui/?path=gui-lib Resolving "compatibility-test" via http://pkgs.racket-lang.org Resolving "images-test" via http://pkgs.racket-lang.org Resolving "drracket-tool-test" via http://pkgs.racket-lang.org Resolving "optimization-coach" via http://pkgs.racket-lang.org Querying Git references for gui-lib at git://github.com/racket/gui/?path=gui-lib Resolving "future-visualizer-typed" via http://pkgs.racket-lang.org Resolving "slideshow" via http://pkgs.racket-lang.org Resolving "slideshow-exe" via http://pkgs.racket-lang.org Querying Git references for gui-lib at git://github.com/racket/gui/?path=gui-lib Resolving "slideshow-plugin" via http://pkgs.racket-lang.org Querying Git references for gui-lib at git://github.com/racket/gui/?path=gui-lib Resolving "unstable-redex" via http://pkgs.racket-lang.org Resolving "redex-gui-lib" via http://pkgs.racket-lang.org Resolving "redex-doc" via http://pkgs.racket-lang.org Resolving "ds-store-lib" via http://pkgs.racket-lang.org Resolving "images-doc" via http://pkgs.racket-lang.org Querying Git references for gui-doc at git://github.com/racket/gui/?path=gui-doc Querying Git references for gui-lib at git://github.com/racket/gui/?path=gui-lib Querying Git references for gui-doc at git://github.com/racket/gui/?path=gui-doc Resolving "slatex" via http://pkgs.racket-lang.org Resolving "schemeunit" via http://pkgs.racket-lang.org Resolving "main-distribution" via http://pkgs.racket-lang.org Resolving "contract-profile" via http://pkgs.racket-lang.org Resolving "datalog" via http://pkgs.racket-lang.org Resolving "deinprogramm" via http://pkgs.racket-lang.org Querying Git references for gui-lib at git://github.com/racket/gui/?path=gui-lib Resolving "drracket-tool" via http://pkgs.racket-lang.org Resolving "errortrace" via http://pkgs.racket-lang.org Resolving "frtime" via http://pkgs.racket-lang.org Querying Git references for gui-lib at git://github.com/racket/gui/?path=gui-lib Querying Git references for gui-doc at git://github.com/racket/gui/?path=gui-doc Querying Git references for gui at git://github.com/racket/gui/?path=gui Resolving "images" via http://pkgs.racket-lang.org Resolving "parser-tools" via http://pkgs.racket-lang.org Resolving "pict-snip" via http://pkgs.racket-lang.org Resolving "pict-snip-lib" via http://pkgs.racket-lang.org Querying Git references for gui-lib at git://github.com/racket/gui/?path=gui-lib Resolving "pict-snip-doc" via http://pkgs.racket-lang.org Querying Git references for gui-doc at git://github.com/racket/gui/?path=gui-doc Resolving "planet" via http://pkgs.racket-lang.org Resolving "profile" via http://pkgs.racket-lang.org Resolving "racklog" via http://pkgs.racket-lang.org Resolving "shell-completion" via http://pkgs.racket-lang.org Resolving "swindle" via http://pkgs.racket-lang.org Querying Git references for gui-lib at git://github.com/racket/gui/?path=gui-lib Resolving "typed-racket" via http://pkgs.racket-lang.org Resolving "unstable-flonum-doc" via http://pkgs.racket-lang.org Resolving "web-server" via http://pkgs.racket-lang.org Resolving "ds-store" via http://pkgs.racket-lang.org Resolving "ds-store-doc" via http://pkgs.racket-lang.org Querying Git references for gui-test at git://github.com/racket/gui/?path=gui-test Resolving "redex-pict-lib" via http://pkgs.racket-lang.org Resolving "gui-x86_64-macosx" via http://pkgs.racket-lang.org Resolving "redex-examples" via http://pkgs.racket-lang.org Resolving "typed-racket-compatibility" via http://pkgs.racket-lang.org Querying Git references for gui-lib at git://github.com/racket/gui/?path=gui-lib Resolving "redex-benchmark" via http://pkgs.racket-lang.org Querying Git references for tex-table at git://github.com/racket/gui/?path=tex-table Updating: gui srfi htdp plot redex srfi-doc htdp-doc plot-doc scribble scribble-html-lib htdp-lib plot-lib srfi-lib plot-test srfi-test htdp-test plot-gui-lib plot-compat gui-doc redex-doc typed-racket-lib redex-gui-lib gui-test typed-racket redex-pict-lib typed-racket-more redex-examples typed-racket-compatibility unstable-flonum-lib gui-lib typed-racket-doc redex-benchmark unstable-flonum-doc scribble-doc typed-racket-test redex-test tex-table scribble-text-lib redex-lib source-syntax scribble-lib scribble-test srfi-lite-lib Querying Git references for gui at git://github.com/racket/gui/?path=gui Fetching from remote repository git://github.com/racket/gui/ git fetch git://github.com/racket/gui/ Cloning repository locally for staging git clone /Users/soegaard/clones/git:/github.com/racket/gui/ /var/folders/pr/5jt3l64s02n_zwtw6hr3tcgw0000gp/T/14210018101421001810726-gui git fetch /Users/soegaard/clones/git:/github.com/racket/gui/ master git checkout 60611bc081349662d27e3caa13dcdb193a3eba7c Using cached14210013731421001373436 for https://github.com/racket/srfi/tarball/992f0938da0fcf4a762fda2f87c7e51772cd6297 Using cached14210014111421001411263 for https://github.com/racket/htdp/tarball/2af3d467e2221ead04495e3f5537465af776c48c Using cached14210014201421001420045 for https://github.com/racket/plot/tarball/220b279918751b1c8b1a560bb406e3e2fffa7ad1 Using cached14210014261421001426951 for https://github.com/racket/redex/tarball/fcf9516a1722426fb98965441eac13ef92f84e0f Using cached14210013731421001373436 for https://github.com/racket/srfi/tarball/992f0938da0fcf4a762fda2f87c7e51772cd6297 Using cached14210014111421001411263 for https://github.com/racket/htdp/tarball/2af3d467e2221ead04495e3f5537465af776c48c Using cached14210014201421001420045 for https://github.com/racket/plot/tarball/220b279918751b1c8b1a560bb406e3e2fffa7ad1 Using cached14210014341421001434954 for https://github.com/racket/scribble/tarball/064ccc9bfc7cef5ffd42095f5d21fae95ec7c614 Using cached14210014341421001434954 for https://github.com/racket/scribble/tarball/064ccc9bfc7cef5ffd42095f5d21fae95ec7c614 Using cached14210014111421001411263 for https://github.com/racket/htdp/tarball/2af3d467e2221ead04495e3f5537465af776c48c Using cached14210014201421001420045 for https://github.com/racket/plot/tarball/220b279918751b1c8b1a560bb406e3e2fffa7ad1 Using cached14210013731421001373436 for https://github.com/racket/srfi/tarball/992f0938da0fcf4a762fda2f87c7e51772cd6297 Using cached14210014201421001420045 for https://github.com/racket/plot/tarball/220b279918751b1c8b1a560bb406e3e2fffa7ad1 Using cached14210013731421001373436 for https://github.com/racket/srfi/tarball/992f0938da0fcf4a762fda2f87c7e51772cd6297 Using cached14210014111421001411263 for https://github.com/racket/htdp/tarball/2af3d467e2221ead04495e3f5537465af776c48c Using cached14210014201421001420045 for https://github.com/racket/plot/tarball/220b279918751b1c8b1a560bb406e3e2fffa7ad1 Using cached14210014201421001420045 for https://github.com/racket/plot/tarball/220b279918751b1c8b1a560bb406e3e2fffa7ad1 Querying Git references for gui-doc at git://github.com/racket/gui/?path=gui-doc Fetching from remote repository git://github.com/racket/gui/ git fetch git://github.com/racket/gui/ Cloning repository locally for staging git clone /Users/soegaard/clones/git:/github.com/racket/gui/ /var/folders/pr/5jt3l64s02n_zwtw6hr3tcgw0000gp/T/14210018191421001819633-gui-doc git fetch /Users/soegaard/clones/git:/github.com/racket/gui/ master git checkout 60611bc081349662d27e3caa13dcdb193a3eba7c Using cached14210014261421001426951 for https://github.com/racket/redex/tarball/fcf9516a1722426fb98965441eac13ef92f84e0f Using cached14210014451421001445875 for https://github.com/racket/typed-racket/tarball/864b0ad5fca7581e0e7be6501330d9005bf6f07f Using cached14210014261421001426951 for https://github.com/racket/redex/tarball/fcf9516a1722426fb98965441eac13ef92f84e0f Querying Git references for gui-test at git://github.com/racket/gui/?path=gui-test Fetching from remote repository git://github.com/racket/gui/ git fetch git://github.com/racket/gui/ Cloning repository locally for staging git clone /Users/soegaard/clones/git:/github.com/racket/gui/ /var/folders/pr/5jt3l64s02n_zwtw6hr3tcgw0000gp/T/14210018221421001822608-gui-test git fetch /Users/soegaard/clones/git:/github.com/racket/gui/ master git checkout 60611bc081349662d27e3caa13dcdb193a3eba7c Using cached14210014451421001445875 for https://github.com/racket/typed-racket/tarball/864b0ad5fca7581e0e7be6501330d9005bf6f07f Using cached14210014261421001426951 for https://github.com/racket/redex/tarball/fcf9516a1722426fb98965441eac13ef92f84e0f Using cached14210014451421001445875 for https://github.com/racket/typed-racket/tarball/864b0ad5fca7581e0e7be6501330d9005bf6f07f Using cached14210014261421001426951 for https://github.com/racket/redex/tarball/fcf9516a1722426fb98965441eac13ef92f84e0f Using cached14210014451421001445875 for https://github.com/racket/typed-racket/tarball/864b0ad5fca7581e0e7be6501330d9005bf6f07f Using cached14210014541421001454105 for https://github.com/racket/unstable-flonum/tarball/7071d9a3ee0ad60f947c0a597ddd4b64bed3d94a Querying Git references for gui-lib at git://github.com/racket/gui/?path=gui-lib Fetching from remote repository git://github.com/racket/gui/ git fetch git://github.com/racket/gui/ Cloning repository locally for staging git clone /Users/soegaard/clones/git:/github.com/racket/gui/ /var/folders/pr/5jt3l64s02n_zwtw6hr3tcgw0000gp/T/14210018271421001827194-gui-lib git fetch /Users/soegaard/clones/git:/github.com/racket/gui/ master git checkout 60611bc081349662d27e3caa13dcdb193a3eba7c Using cached14210014451421001445875 for https://github.com/racket/typed-racket/tarball/864b0ad5fca7581e0e7be6501330d9005bf6f07f Using cached14210014261421001426951 for https://github.com/racket/redex/tarball/fcf9516a1722426fb98965441eac13ef92f84e0f Using cached14210014541421001454105 for https://github.com/racket/unstable-flonum/tarball/7071d9a3ee0ad60f947c0a597ddd4b64bed3d94a Using cached14210014341421001434954 for https://github.com/racket/scribble/tarball/064ccc9bfc7cef5ffd42095f5d21fae95ec7c614 Using cached14210014451421001445875 for https://github.com/racket/typed-racket/tarball/864b0ad5fca7581e0e7be6501330d9005bf6f07f Using cached14210014261421001426951 for https://github.com/racket/redex/tarball/fcf9516a1722426fb98965441eac13ef92f84e0f Querying Git references for tex-table at git://github.com/racket/gui/?path=tex-table Fetching from remote repository git://github.com/racket/gui/ git fetch git://github.com/racket/gui/ Cloning repository locally for staging git clone /Users/soegaard/clones/git:/github.com/racket/gui/ /var/folders/pr/5jt3l64s02n_zwtw6hr3tcgw0000gp/T/14210018321421001832103-tex-table git fetch /Users/soegaard/clones/git:/github.com/racket/gui/ master git checkout 60611bc081349662d27e3caa13dcdb193a3eba7c Using cached14210014341421001434954 for https://github.com/racket/scribble/tarball/064ccc9bfc7cef5ffd42095f5d21fae95ec7c614 Using cached14210014261421001426951 for https://github.com/racket/redex/tarball/fcf9516a1722426fb98965441eac13ef92f84e0f Using cached14210014451421001445875 for https://github.com/racket/typed-racket/tarball/864b0ad5fca7581e0e7be6501330d9005bf6f07f Using cached14210014341421001434954 for https://github.com/racket/scribble/tarball/064ccc9bfc7cef5ffd42095f5d21fae95ec7c614 Using cached14210014341421001434954 for https://github.com/racket/scribble/tarball/064ccc9bfc7cef5ffd42095f5d21fae95ec7c614 Using cached14210013731421001373436 for https://github.com/racket/srfi/tarball/992f0938da0fcf4a762fda2f87c7e51772cd6297 Merging commits at /Users/soegaard/clones/git:/github.com/racket/gui/ git merge --ff-only 60611bc081349662d27e3caa13dcdb193a3eba7c error: 'merge' is not possible because you have unmerged files. hint: Fix them up in the work tree, hint: and then use 'git add/rm <file>' as hint: appropriate to mark resolution and make a commit, hint: or use 'git commit -a'. fatal: Exiting because of an unresolved conflict. raco pkg update: Git command failed make[2]: *** [plain-in-place] Error 1 make[1]: *** [cpus-in-place] Error 2 make: *** [in-place] Error 2 mba-5:plt soegaard$ git status On branch master Your branch is up-to-date with 'origin/master'. Untracked files: (use "git add <file>..." to include in what will be committed) native-pkgs/ nothing added to commit but untracked files present (use "git add" to track) mba-5:plt soegaard$ -- -- Jens Axel Søgaard _________________________ Racket Developers list: http://lists.racket-lang.org/dev