Re: HEADS UP: MIT KRB5 1.22.1 Import
- In reply to: Cy Schubert : "Re: HEADS UP: MIT KRB5 1.22.1 Import"
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 21 Aug 2025 18:55:26 UTC
> On Aug 21, 2025, at 9:40 AM, Cy Schubert <Cy.Schubert@cschubert.com> wrote: > > In message <20250821162750.D9BCC307@slippy.cwsent.com>, Cy Schubert writes: … > I used the vendor branch commit hash. As with git-diff the files are rooted > from contrib/krb5 not from the root of the source tree. This must be a > subtree merge thing. I’ve been using `git subtree merge -P` as of late when doing vendor imports. git merge/git cherry-pick don’t do the right thing when I run those commands. Cheers, -Enji