Sunday, August 20, 2023

Re: Patch 1766 doesn't exist

On Sun, Aug 20, 2023 at 10:14 PM Christian Brabandt <cblists@256bit.org> wrote:
>
>
> On So, 20 Aug 2023, Tony Mechelynck wrote:
>
> > With all patches in, :version (or vim --version) includes the line
> >
> > Included patches: 1-1765, 1767-1769
> >
> > meaning that there is no patch 1766. I suppose that this is just an
> > oversight and that no Vim user should be alarmed by it.
> >
> > I'm sending this to vim_use to let all users of Vim know that this
> > "missing patch" should probably be no cause for alarm.
>
> Sorry, I must have messed it up when adding the Commit prefix to the
> script. Somehow the mercurial mirror lost some changes. They should now
> be in sync again, but some patches between 1766 - 1775 are probably be
> not in sync with the git patches :/
>
> I apologize for this mess.
>
> Best,
> Christian
> --
> I am not a politician and my other habits are also good.
> -- A. Ward

Yeah, shortly after I sent the above message there came additional
changesets, with a couple of additional missing versions ; then "hg
fetch" refused to merge because there were several outlying heads in
the default branch — so I merged them back manualy as best I could
with each other and with my (few) local changes, and "hg merge" each
time displayed a 3-way vimdiff for src/version.c — to make sure that
the merge took the right copy I made all three buffers equal to what I
thought was wanted — and now Vim says "Included patches: 1-1778". The
latest "hg fetch" pulled and merged without requiring my intervention
so I assume that my clone is OK again.

Oh, BTW : src/version.o has a line for patch 1778 but AFAICT there is
no tag v9.0.1778 known to Mercurial.

Best regards,
Tony.

--
--
You received this message from the "vim_use" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php

---
You received this message because you are subscribed to the Google Groups "vim_use" group.
To unsubscribe from this group and stop receiving emails from it, send an email to vim_use+unsubscribe@googlegroups.com.
To view this discussion on the web visit https://groups.google.com/d/msgid/vim_use/CAJkCKXuAFLZAzd8cN_TLhTfpof7W1DEZTpoNXWnG7Z5081FB4w%40mail.gmail.com.

No comments: