Date: Tue, 15 Aug 2023 16:43:13 -0700 From: Enji Cooper <yaneurabeya@gmail.com> To: Jessica Clarke <jrtc27@FreeBSD.org> Cc: Enji Cooper <ngie@FreeBSD.org>, "src-committers@freebsd.org" <src-committers@FreeBSD.org>, "dev-commits-src-all@freebsd.org" <dev-commits-src-all@FreeBSD.org>, "dev-commits-src-main@freebsd.org" <dev-commits-src-main@FreeBSD.org> Subject: Re: git: 28f6c2f29280 - main - Import GoogleTest 1.14.0 Message-ID: <F5032077-D2EB-44B6-89E4-CAE8BA9409AD@gmail.com> In-Reply-To: <5759AF55-F1DE-4128-9579-B0A654114D92@freebsd.org> References: <202308100232.37A2Wdaw040438@gitrepo.freebsd.org> <5759AF55-F1DE-4128-9579-B0A654114D92@freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--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 <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 Content-Transfer-Encoding: quoted-printable Content-Type: text/html; charset=utf-8 <html><head><meta http-equiv=3D"Content-Type" content=3D"text/html; = charset=3Dutf-8"></head><body style=3D"word-wrap: break-word; = -webkit-nbsp-mode: space; line-break: after-white-space;" class=3D""><br = class=3D""><div><blockquote type=3D"cite" class=3D""><div class=3D"">On = Aug 15, 2023, at 12:15 PM, Jessica Clarke <<a = href=3D"mailto:jrtc27@FreeBSD.org" class=3D"">jrtc27@FreeBSD.org</a>> = wrote:</div></blockquote><div><br class=3D""></div>=E2=80=A6</div><div><br= class=3D""><blockquote type=3D"cite" class=3D""><div class=3D""><span = style=3D"caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: = 12px; font-style: normal; font-variant-caps: normal; font-weight: 400; = letter-spacing: normal; text-align: start; text-indent: 0px; = text-transform: none; white-space: normal; word-spacing: 0px; = -webkit-text-stroke-width: 0px; text-decoration: none; float: none; = display: inline !important;" class=3D"">What=E2=80=99s this thing? = Sounds like you did some merging, squashing and</span><br = style=3D"caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: = 12px; font-style: normal; font-variant-caps: normal; font-weight: 400; = letter-spacing: normal; text-align: start; text-indent: 0px; = text-transform: none; white-space: normal; word-spacing: 0px; = -webkit-text-stroke-width: 0px; text-decoration: none;" class=3D""><span = style=3D"caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: = 12px; font-style: normal; font-variant-caps: normal; font-weight: 400; = letter-spacing: normal; text-align: start; text-indent: 0px; = text-transform: none; white-space: normal; word-spacing: 0px; = -webkit-text-stroke-width: 0px; text-decoration: none; float: none; = display: inline !important;" class=3D"">rebasing, didn=E2=80=99t fix up = the commit message and didn=E2=80=99t notice that git</span><br = style=3D"caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: = 12px; font-style: normal; font-variant-caps: normal; font-weight: 400; = letter-spacing: normal; text-align: start; text-indent: 0px; = text-transform: none; white-space: normal; word-spacing: 0px; = -webkit-text-stroke-width: 0px; text-decoration: none;" class=3D""><span = style=3D"caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: = 12px; font-style: normal; font-variant-caps: normal; font-weight: 400; = letter-spacing: normal; text-align: start; text-indent: 0px; = text-transform: none; white-space: normal; word-spacing: 0px; = -webkit-text-stroke-width: 0px; text-decoration: none; float: none; = display: inline !important;" class=3D"">rebase eats merges? See [1] for = how to do this properly.</span><br style=3D"caret-color: rgb(0, 0, 0); = font-family: Helvetica; font-size: 12px; font-style: normal; = font-variant-caps: normal; font-weight: 400; letter-spacing: normal; = text-align: start; text-indent: 0px; text-transform: none; white-space: = normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; = text-decoration: none;" class=3D""></div></blockquote></div><br = class=3D""><div class=3D""><span class=3D"Apple-tab-span" = style=3D"white-space:pre"> </span>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.</div><div = class=3D"">Thank you for the pointer,</div><div = class=3D"">-Enji</div></body></html>= --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--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?F5032077-D2EB-44B6-89E4-CAE8BA9409AD>