> On Tue, 2022-11-01 at 20:25 -0400, Stefan Berger wrote: > > On 11/1/22 19:04, Mimi Zohar wrote: > > > Hi Stefan, > > > On Tue, 2022-11-01 at 17:46 -0400, Stefan Berger wrote: > > >> On 11/1/22 16:17, Mimi Zohar wrote: > > >>> This reverts commit acb19d1894a4a95471b8d2346cd6c3ecf3385110. > > >> $ git show acb19d1 > > >> fatal: ambiguous argument 'acb19d1': unknown revision or path not in the working tree. > > >> Are you reverting this from a public tree? or could you just drop this patch from your series? > > >> Also after removing this patch from the mbox file I cannot apply these patches to my sourceforge checkout -- presumably next-testing branch: > > >> $ git am ./v4_20221101_zohar_address_deprecated_warnings.mbx > > >> Applying: log and reset 'errno' after failure to open non-critical files > > >> Applying: Log and reset 'errno' on lsetxattr failure > > >> Applying: travis: update dist=focal > > >> Applying: Update configure.ac to address a couple of obsolete warnings > > >> Applying: Deprecate IMA signature version 1 > > >> error: patch failed: src/libimaevm.c:684 > > >> error: src/libimaevm.c: patch does not apply > > >> Patch failed at 0005 Deprecate IMA signature version 1 > > >> hint: Use 'git am --show-current-patch=diff' to see the failed patch > > >> When you have resolved this problem, run "git am --continue". > > >> If you prefer to skip this patch, run "git am --skip" instead. > > >> To restore the original branch and stop patching, run "git am --abort". > > > Sorry, I should have used "--base=auto" when generating the patch set. > > > Yes, the patch set is based on the github next-testing branch. > > Is the github repo now the main repo and sourceforge repo is dead? > The "next" branch in both repo's are the same. Before posting patches, > I verify that github Actions works. As a result, the next-testing > branch on github is rebased frequently. Once a patch set is ready, the > "next" branch in both repo's is updated. > To answer your question the github repo is primary. Maybe deleting everything in sourceforge and ad put single file with link to github.com would save you work (having master, next and next-testing branches with this file). Kind regards, Petr > Mimi
