From nobody Tue Aug 15 23:43:13 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RQSWV63yqz4mPDP; Tue, 15 Aug 2023 23:43:18 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: from mail-pj1-x1036.google.com (mail-pj1-x1036.google.com [IPv6:2607:f8b0:4864:20::1036]) (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 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RQSWV3pX6z4RLm; Tue, 15 Aug 2023 23:43:18 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-pj1-x1036.google.com with SMTP id 98e67ed59e1d1-26b41112708so2547587a91.3; Tue, 15 Aug 2023 16:43:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1692142996; x=1692747796; h=references:to:cc:in-reply-to:date:subject:mime-version:message-id :from:from:to:cc:subject:date:message-id:reply-to; bh=Ci42YmOx5kraAPqcip4ifXVG5eyaniuWsUPTra4K9yc=; b=nnflEr/0nB/Sx3Dd1wfhHgn7ppxodICHZq/UmMtDbbucik/JuwIdVJWpaB4mtKWB+Y o2Wdr9NqP0omcA5NZexKJ5pEuQN6cfbwZT/kkf2EtAwlisEHfBdtB7C9ge6YeDXONeC2 tGzPSs5/THe83OJo4WGc3Gb7yMqJulajf5A/hrU4kxXDlJc0qYfxRvvmQX01by+6gQfI wpXgnFxEdynn0bMQNdm5Q1kYVSGQvIlKbX6rzis/EQoT2VBqU7zeED+uM9e6sw350FH7 JauClUipY5NibPI8wmFxNlvr9ENVwf0xF+XssvQni+SkosY8sKV8DLkYNomismEA9ERI GvSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692142996; x=1692747796; h=references:to:cc:in-reply-to:date:subject:mime-version:message-id :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Ci42YmOx5kraAPqcip4ifXVG5eyaniuWsUPTra4K9yc=; b=d5/XDh7rGXXH//0RRcLN4eO9mJrFzYcOeWG28833O9Okno9Sx+N3r+65Zl1hR4YM/v +5/jJllkC42g9HpZ8wBD/tp33qx4oi0yb+AVlCGiVh+IkHd3OqLqCAFa7w1WxbUpExKl 3VtGKcLIVp+FrlHQ53H0wC8+eWbjFNOvmz3vWBsg8iR2DdWnn5r26hFJ5F0VCbYUqf1A cOK1QbqyUPku1r0eI7hOP6VkKf2EY99qFnhU5bqfQWHSe4QZFX5B3TR3q1MxRN0porKe OGShzcvUp86HCgmJvWlK1pj9SsiVcsedRCqPnRUpwpCfLMM9WDuVD+c+4w3NNzzohxsZ aLeA== X-Gm-Message-State: AOJu0YylXvZk9URELqk7YxS7jjPYD3nCMRvm2FPMhpHxEJOMDa74ftlR Y4sh96QFqoxgrfMJ2vQ41wYczi70u1Y= X-Google-Smtp-Source: AGHT+IFGLddBbbrgRa7XoXyXFQlpYfWyU1pvr0jcjBU1IrIUzjfMd71fMcnw93bWxzSOaOrzAMUjug== X-Received: by 2002:a17:90a:e004:b0:26b:be62:c229 with SMTP id u4-20020a17090ae00400b0026bbe62c229mr96623pjy.32.1692142995807; Tue, 15 Aug 2023 16:43:15 -0700 (PDT) Received: from smtpclient.apple (c-73-19-52-228.hsd1.wa.comcast.net. [73.19.52.228]) by smtp.gmail.com with ESMTPSA id c6-20020a17090a674600b0026b25c05495sm8133681pjm.20.2023.08.15.16.43.14 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 15 Aug 2023 16:43:15 -0700 (PDT) From: Enji Cooper Message-Id: Content-Type: multipart/signed; boundary="Apple-Mail=_EB5587B2-0386-451C-91B3-AC4B4469B6DD"; protocol="application/pgp-signature"; micalg=pgp-sha256 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3696.120.41.1.4\)) Subject: Re: git: 28f6c2f29280 - main - Import GoogleTest 1.14.0 Date: Tue, 15 Aug 2023 16:43:13 -0700 In-Reply-To: <5759AF55-F1DE-4128-9579-B0A654114D92@freebsd.org> Cc: Enji Cooper , "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" To: Jessica Clarke References: <202308100232.37A2Wdaw040438@gitrepo.freebsd.org> <5759AF55-F1DE-4128-9579-B0A654114D92@freebsd.org> X-Mailer: Apple Mail (2.3696.120.41.1.4) X-Rspamd-Queue-Id: 4RQSWV3pX6z4RLm X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] --Apple-Mail=_EB5587B2-0386-451C-91B3-AC4B4469B6DD Content-Type: multipart/alternative; boundary="Apple-Mail=_751F167C-0D1F-463B-B157-0D03B9E730C1" --Apple-Mail=_751F167C-0D1F-463B-B157-0D03B9E730C1 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf-8 > On Aug 15, 2023, at 12:15 PM, Jessica Clarke = wrote: =E2=80=A6 > What=E2=80=99s this thing? Sounds like you did some merging, squashing = and > rebasing, didn=E2=80=99t fix up the commit message and didn=E2=80=99t = notice that git > rebase eats merges? See [1] for how to do this properly. Ugh. That process looks incredibly annoying=E2=80=94especially = when dealing with conflicts that can=E2=80=99t be easily scripted due to = changes made in the pre-git vendor-forked source tree. Ok, I'll do next = time. Thank you for the pointer, -Enji --Apple-Mail=_751F167C-0D1F-463B-B157-0D03B9E730C1 Content-Transfer-Encoding: quoted-printable Content-Type: text/html; charset=utf-8
On = Aug 15, 2023, at 12:15 PM, Jessica Clarke <jrtc27@FreeBSD.org> = wrote:

=E2=80=A6
What=E2=80=99s this thing? = Sounds like you did some merging, squashing and
rebasing, didn=E2=80=99t fix up = the commit message and didn=E2=80=99t notice that git
rebase eats merges? See [1] for = how to do this properly.

Ugh. That process looks = incredibly annoying=E2=80=94especially when dealing with conflicts that = can=E2=80=99t be easily scripted due to changes made in the pre-git = vendor-forked source tree. Ok, I'll do next time.
Thank you for the pointer,
-Enji
= --Apple-Mail=_751F167C-0D1F-463B-B157-0D03B9E730C1-- --Apple-Mail=_EB5587B2-0386-451C-91B3-AC4B4469B6DD Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEtvtxN6kOllEF3nmX5JFNMZeDGN4FAmTcDZIACgkQ5JFNMZeD GN4hthAAlEEKAKgoWmn7iQYrhFwT0l6oAET3hcMESDrD4JWc03OpLZRUlt+hDjPx +WXG5Ff2LK206ZMg5IMS+GLF/9VP6Uu0w9qTKTlH4wuLi4g+OiiHzzCb6oJMnDL6 daxqaaWTjL5sJGlBb2HBgWWcR5ulpKVLlud7p6pesJ3VKjtTvYNWXimPwYzhd47i fiyey2IdK897Xfj4ISUso1kFor6jpovVD7dFSrnLRJrfDkY7ej3rMimDVLQ94Y5b BeYBlqjJjqf/zOk9+rochFPH1Yup/WYmh+M4L84RrB0uVZYvu322UETLjLjeLeli XFnjdNkY6rhHUKR0DJr44XIgvv01AYCR6DKJ1EE8G7q3eMGym6HA7B93Jrobya16 yUToD7W9SmMvnOxHHj6PvSLJ+w1eHhYgZZyrFAkHstTPclv/corAZPsBxpcOoGQT MTR8atIGg5HAMKX4QGi/L3C2u26/3aUBwYjJW8dw2tg7dbknoJsJL+BQx8zTyZur LRmuRnQGC9ordZ0YnlgQD2lZYMaPmQ86rZ7b/z+TVHhRlxja1ys0WbQhLBEgSRGo UkM60BYgGxA30KcTR3xsUwdGGOwcvQFj2E0uq4X+96iC0xDn/4FqGQPcYkZD6wvk /nDIaQeUf212xUKpegfM3IhLG1KiDucDP2cEFxrdsmj7/SbrD4M= =N8jH -----END PGP SIGNATURE----- --Apple-Mail=_EB5587B2-0386-451C-91B3-AC4B4469B6DD--