From owner-freebsd-current@freebsd.org Fri Sep 25 23:25:54 2020 Return-Path: Delivered-To: freebsd-current@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 829493E8252 for ; Fri, 25 Sep 2020 23:25:54 +0000 (UTC) (envelope-from doctorwhoguy@gmail.com) Received: from mail-ej1-x629.google.com (mail-ej1-x629.google.com [IPv6:2a00:1450:4864:20::629]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Byp1s5YcGz3Ts0; Fri, 25 Sep 2020 23:25:53 +0000 (UTC) (envelope-from doctorwhoguy@gmail.com) Received: by mail-ej1-x629.google.com with SMTP id o8so796794ejb.10; Fri, 25 Sep 2020 16:25:53 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to:cc; bh=T9dp5J8gU9jhB4dP+mb9/jNU/SfmVPyQ1DgAaYM7kko=; b=d2sJnASkRWvgxLl2Iij6XMnjLulcL2+xkiS3LNUwVXjIA4F44i4HBHdu8KH+gQRyqP 3enShAtSr5ayUV1vm3u1UQmSzvwnvgRdYUvaWlE+1SoCM1+PJ16wH9YNMvjhOH/9pgPh AcEke0fQaExYX/sYaoL3VetIvbnduA5vioEviNTpS08vYt3lmBoJEUMjM2kjuUydYF8y SwW4BAZPYEE1xwHdIhs6ATHIMumMk8a5JYVwQz6nhLNHO1Uip9bfyeRNRxicYi+CUG6D 0FyK2To0/HnNuwK19cT6CVx3Tb052UPEi3uA71zFDZPsJZkN65paKmoKJsZeJIR+DKYI tWZw== X-Gm-Message-State: AOAM532+jhNgNbp3ijUDl47dgTbhAiwGgOREv9ERHsuilSi3iDzVcACm pH3ytCK8B1F5W150bd9gAV6lA6WPO2afbLfH+DosObNWIFE= X-Google-Smtp-Source: ABdhPJy2bbr77aC8zSKOMRy72xZVWHdod4aQFCFDroxxG89ednuHAb4DXK8Dov8w/3nORR9gJVXlop7aMtfa/vRdrG8= X-Received: by 2002:a17:906:6ce:: with SMTP id v14mr4979197ejb.451.1601076351500; Fri, 25 Sep 2020 16:25:51 -0700 (PDT) MIME-Version: 1.0 From: Patrick McMunn Date: Fri, 25 Sep 2020 18:25:39 -0500 Message-ID: Subject: error pulling from the Beta git repo To: emaste@freebsd.org Cc: freebsd-current@freebsd.org X-Rspamd-Queue-Id: 4Byp1s5YcGz3Ts0 X-Spamd-Bar: -- X-Spamd-Result: default: False [-2.45 / 15.00]; RCVD_TLS_ALL(0.00)[]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20161025]; NEURAL_HAM_MEDIUM(-1.00)[-1.003]; FROM_HAS_DN(0.00)[]; FREEMAIL_FROM(0.00)[gmail.com]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; TO_DN_NONE(0.00)[]; NEURAL_HAM_LONG(-1.00)[-0.999]; R_SPF_ALLOW(-0.20)[+ip6:2a00:1450:4000::/36]; NEURAL_SPAM_SHORT(0.55)[0.553]; DKIM_TRACE(0.00)[gmail.com:+]; RCPT_COUNT_TWO(0.00)[2]; RCVD_IN_DNSWL_NONE(0.00)[2a00:1450:4864:20::629:from]; DMARC_POLICY_ALLOW(-0.50)[gmail.com,none]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:~]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US]; RCVD_COUNT_TWO(0.00)[2]; MAILMAN_DEST(0.00)[freebsd-current]; DWL_DNSWL_NONE(0.00)[gmail.com:dkim] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.33 X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Sep 2020 23:25:54 -0000 I'm using the beta git repo at , and I have been compiling source in that directory. Today, when I ran "git pull", it errored out instead of updating fully. I don't know if the error was a result of me building in the directory, but it seems like a reasonable possibility. It was never an issue with SVN, but should I build the source in a separate directory to avoid problems with git? I don't know if git keeps a log that I can check for the full output. If it does, I'd check if I knew the location. As it is, I only have the partial output still present in my terminal window. Following is the last portion of the output if it helps to identify the error and its cause: Auto-merging crypto/openssl/crypto/x509v3/v3_purp.c CONFLICT (content): Merge conflict in crypto/openssl/crypto/x509v3/v3_purp.c CONFLICT (rename/delete): crypto/x509/x_pubkey.c deleted in 2541f3df33872528e8bd003b97a78668119f812d and renamed to crypto/openssl/crypto/x509/x_pubkey.c in HEAD. Version HEAD of crypto/openssl/crypto/x509/x_pubkey.c left in tree. Auto-merging crypto/openssl/crypto/x509/x509_vfy.c CONFLICT (content): Merge conflict in crypto/openssl/crypto/x509/x509_vfy.c CONFLICT (rename/delete): crypto/x509/x509_local.h deleted in 2541f3df33872528e8bd003b97a78668119f812d and renamed to crypto/openssl/crypto/x509/x509_local.h in HEAD. Version HEAD of crypto/openssl/crypto/x509/x509_local.h left in tree. CONFLICT (rename/delete): crypto/whrlpool/wp_block.c deleted in 2541f3df33872528e8bd003b97a78668119f812d and renamed to crypto/openssl/crypto/whrlpool/wp_block.c in HEAD. Version HEAD of crypto/openssl/crypto/whrlpool/wp_block.c left in tree. Auto-merging crypto/openssl/crypto/ui/ui_openssl.c CONFLICT (content): Merge conflict in crypto/openssl/crypto/ui/ui_openssl.c CONFLICT (rename/delete): crypto/ts/ts_rsp_sign.c deleted in 2541f3df33872528e8bd003b97a78668119f812d and renamed to crypto/openssl/crypto/ts/ts_rsp_sign.c in HEAD. Version HEAD of crypto/openssl/crypto/ts/ts_rsp_sign.c left in tree. CONFLICT (rename/delete): crypto/store/store_lib.c deleted in 2541f3df33872528e8bd003b97a78668119f812d and renamed to crypto/openssl/crypto/store/store_lib.c in HEAD. Version HEAD of crypto/openssl/crypto/store/store_lib.c left in tree. CONFLICT (rename/delete): crypto/store/loader_file.c deleted in 2541f3df33872528e8bd003b97a78668119f812d and renamed to crypto/openssl/crypto/store/loader_file.c in HEAD. Version HEAD of crypto/openssl/crypto/store/loader_file.c left in tree. CONFLICT (rename/delete): crypto/rsa/rsa_ameth.c deleted in 2541f3df33872528e8bd003b97a78668119f812d and renamed to crypto/openssl/crypto/rsa/rsa_ameth.c in HEAD. Version HEAD of crypto/openssl/crypto/rsa/rsa_ameth.c left in tree. CONFLICT (rename/delete): crypto/rand/rand_local.h deleted in 2541f3df33872528e8bd003b97a78668119f812d and renamed to crypto/openssl/crypto/rand/rand_local.h in HEAD. Version HEAD of crypto/openssl/crypto/rand/rand_local.h left in tree. CONFLICT (rename/delete): crypto/rand/drbg_lib.c deleted in 2541f3df33872528e8bd003b97a78668119f812d and renamed to crypto/openssl/crypto/rand/drbg_lib.c in HEAD. Version HEAD of crypto/openssl/crypto/rand/drbg_lib.c left in tree. CONFLICT (rename/delete): crypto/rand/drbg_ctr.c deleted in 2541f3df33872528e8bd003b97a78668119f812d and renamed to crypto/openssl/crypto/rand/drbg_ctr.c in HEAD. Version HEAD of crypto/openssl/crypto/rand/drbg_ctr.c left in tree. CONFLICT (add/add): Merge conflict in crypto/openssl/crypto/pem/pvkfmt.c Auto-merging crypto/openssl/crypto/pem/pvkfmt.c Auto-merging crypto/openssl/crypto/pem/pem_pkey.c CONFLICT (content): Merge conflict in crypto/openssl/crypto/pem/pem_pkey.c Auto-merging crypto/openssl/crypto/pem/pem_lib.c CONFLICT (content): Merge conflict in crypto/openssl/crypto/pem/pem_lib.c Auto-merging crypto/openssl/crypto/o_time.c CONFLICT (content): Merge conflict in crypto/openssl/crypto/o_time.c CONFLICT (rename/delete): crypto/modes/xts128.c deleted in 2541f3df33872528e8bd003b97a78668119f812d and renamed to crypto/openssl/crypto/modes/xts128.c in HEAD. Version HEAD of crypto/openssl/crypto/modes/xts128.c left in tree. CONFLICT (rename/delete): crypto/modes/ofb128.c deleted in 2541f3df33872528e8bd003b97a78668119f812d and renamed to crypto/openssl/crypto/modes/ofb128.c in HEAD. Version HEAD of crypto/openssl/crypto/modes/ofb128.c left in tree. CONFLICT (rename/delete): crypto/modes/modes_local.h deleted in 2541f3df33872528e8bd003b97a78668119f812d and renamed to crypto/openssl/crypto/modes/modes_local.h in HEAD. Version HEAD of crypto/openssl/crypto/modes/modes_local.h left in tree. CONFLICT (rename/delete): crypto/modes/gcm128.c deleted in 2541f3df33872528e8bd003b97a78668119f812d and renamed to crypto/openssl/crypto/modes/gcm128.c in HEAD. Version HEAD of crypto/openssl/crypto/modes/gcm128.c left in tree. CONFLICT (rename/delete): crypto/modes/ctr128.c deleted in 2541f3df33872528e8bd003b97a78668119f812d and renamed to crypto/openssl/crypto/modes/ctr128.c in HEAD. Version HEAD of crypto/openssl/crypto/modes/ctr128.c left in tree. CONFLICT (rename/delete): crypto/modes/cfb128.c deleted in 2541f3df33872528e8bd003b97a78668119f812d and renamed to crypto/openssl/crypto/modes/cfb128.c in HEAD. Version HEAD of crypto/openssl/crypto/modes/cfb128.c left in tree. CONFLICT (rename/delete): crypto/modes/ccm128.c deleted in 2541f3df33872528e8bd003b97a78668119f812d and renamed to crypto/openssl/crypto/modes/ccm128.c in HEAD. Version HEAD of crypto/openssl/crypto/modes/ccm128.c left in tree. CONFLICT (rename/delete): crypto/modes/cbc128.c deleted in 2541f3df33872528e8bd003b97a78668119f812d and renamed to crypto/openssl/crypto/modes/cbc128.c in HEAD. Version HEAD of crypto/openssl/crypto/modes/cbc128.c left in tree. CONFLICT (rename/delete): crypto/mem_sec.c deleted in 2541f3df33872528e8bd003b97a78668119f812d and renamed to crypto/openssl/crypto/mem_sec.c in HEAD. Version HEAD of crypto/openssl/crypto/mem_sec.c left in tree. CONFLICT (rename/delete): crypto/err/openssl.txt deleted in 2541f3df33872528e8bd003b97a78668119f812d and renamed to crypto/openssl/crypto/err/openssl.txt in HEAD. Version HEAD of crypto/openssl/crypto/err/openssl.txt left in tree. Auto-merging crypto/openssl/crypto/engine/eng_lib.c CONFLICT (content): Merge conflict in crypto/openssl/crypto/engine/eng_lib.c CONFLICT (add/add): Merge conflict in crypto/openssl/crypto/ec/ecp_nistz256.c Auto-merging crypto/openssl/crypto/ec/ecp_nistz256.c CONFLICT (rename/delete): crypto/ec/ecp_nistp521.c deleted in 2541f3df33872528e8bd003b97a78668119f812d and renamed to crypto/openssl/crypto/ec/ecp_nistp521.c in HEAD. Version HEAD of crypto/openssl/crypto/ec/ecp_nistp521.c left in tree. CONFLICT (rename/delete): crypto/ec/ecp_nistp224.c deleted in 2541f3df33872528e8bd003b97a78668119f812d and renamed to crypto/openssl/crypto/ec/ecp_nistp224.c in HEAD. Version HEAD of crypto/openssl/crypto/ec/ecp_nistp224.c left in tree. CONFLICT (rename/delete): crypto/ec/ec_local.h deleted in 2541f3df33872528e8bd003b97a78668119f812d and renamed to crypto/openssl/crypto/ec/ec_local.h in HEAD. Version HEAD of crypto/openssl/crypto/ec/ec_local.h left in tree. Auto-merging crypto/openssl/crypto/ec/ec_lib.c CONFLICT (add/add): Merge conflict in crypto/openssl/crypto/ec/ec_ameth.c Auto-merging crypto/openssl/crypto/ec/ec_ameth.c CONFLICT (rename/delete): crypto/ec/asm/ecp_nistz256-armv4.pl deleted in 2541f3df33872528e8bd003b97a78668119f812d and renamed to crypto/openssl/crypto/ec/asm/ecp_nistz256-armv4.pl in HEAD. Version HEAD of crypto/openssl/crypto/ec/asm/ecp_nistz256-armv4.pl left in tree. CONFLICT (rename/delete): crypto/cmac/cmac.c deleted in 2541f3df33872528e8bd003b97a78668119f812d and renamed to crypto/openssl/crypto/cmac/cmac.c in HEAD. Version HEAD of crypto/openssl/crypto/cmac/cmac.c left in tree. Auto-merging crypto/openssl/crypto/bn/bn_lib.c CONFLICT (content): Merge conflict in crypto/openssl/crypto/bn/bn_lib.c CONFLICT (add/add): Merge conflict in crypto/openssl/appveyor.yml Auto-merging crypto/openssl/appveyor.yml Auto-merging crypto/openssl/apps/s_client.c CONFLICT (content): Merge conflict in crypto/openssl/apps/s_client.c Auto-merging crypto/openssl/README CONFLICT (content): Merge conflict in crypto/openssl/README CONFLICT (rename/delete): NOTES.PERL deleted in 2541f3df33872528e8bd003b97a78668119f812d and renamed to crypto/openssl/NOTES.PERL in HEAD. Version HEAD of crypto/openssl/NOTES.PERL left in tree. Auto-merging crypto/openssl/NEWS CONFLICT (content): Merge conflict in crypto/openssl/NEWS Auto-merging crypto/openssl/Configure CONFLICT (content): Merge conflict in crypto/openssl/Configure Auto-merging crypto/openssl/CHANGES CONFLICT (content): Merge conflict in crypto/openssl/CHANGES Auto-merging contrib/one-true-awk/lex.c Auto-merging contrib/one-true-awk/b.c Auto-merging contrib/one-true-awk/awk.h CONFLICT (rename/delete): man/vi.1 deleted in 2541f3df33872528e8bd003b97a78668119f812d and renamed to contrib/nvi/man/vi.1 in HEAD. Version HEAD of contrib/nvi/man/vi.1 left in tree. CONFLICT (add/add): Merge conflict in contrib/libexecinfo/unwind.c Auto-merging contrib/libexecinfo/unwind.c CONFLICT (rename/delete): warshall.c deleted in 2541f3df33872528e8bd003b97a78668119f812d and renamed to contrib/byacc/warshall.c in HEAD. Version HEAD of contrib/byacc/warshall.c left in tree. CONFLICT (rename/delete): closure.c deleted in 2541f3df33872528e8bd003b97a78668119f812d and renamed to contrib/byacc/closure.c in HEAD. Version HEAD of contrib/byacc/closure.c left in tree. Auto-merging bin/cp/Makefile CONFLICT (content): Merge conflict in bin/cp/Makefile Auto-merging ObsoleteFiles.inc CONFLICT (content): Merge conflict in ObsoleteFiles.inc Auto-merging Makefile.inc1 CONFLICT (content): Merge conflict in Makefile.inc1 Auto-merging Makefile CONFLICT (content): Merge conflict in Makefile CONFLICT (add/add): Merge conflict in .clang-format Auto-merging .clang-format warning: inexact rename detection was skipped due to too many files. warning: you may want to set your merge.renamelimit variable to at least 132108 and retry the command. Automatic merge failed; fix conflicts and then commit the result.