git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH] Don't use merge labels in the ed scripts

From
PRPavel Roskin <proski@gnu.org>
Date
Mar 22, 2006, 04:07 UTC
Message-ID
<1143000449.23183.8.camel@dv>
In-Reply-To
<20060321214818.GY19263@pasky.or.cz>
Hi, Petr!
On Tue, 2006-03-21 at 22:48 +0100, Petr Baudis wrote:
Show 6 quoted lines
> > > Well, I sincerely hope that they won't change again. ;-)
> > 
> > Actually, it would be nice to never expose labels starting with
> > ".merge_file_" - cogito should provide more meaningful labels instead.
> 
>   we shouldn't ever expose them, though. If we do, that's a bug.

It turns out those labels were produced by "git merge". Either "git merge" should be removed from the test, or "cg-reset" should be used after the failure. I prefer the later since it's another test for Cogito.

Once the mess from "git merge" is cleaned up, it turns out that the last merge in the testsuite doesn't fail, and several final fixups are no longer needed. I think it should be OK to remove corresponding code. It has no Cogito commands other than cg-commit, which is already tested elsewhere.

I'm sending you the new patch.
-- 
Regards,
Pavel Roskin
Previous: Petr Baudis
Message 5 of 5 in “Don't use merge labels in the ed scripts”
  1. Don't use merge labels in the ed scriptsPavel Roskin, Mar 21, 2006
  2. Petr BaudisMar 21, 2006
  3. Pavel RoskinMar 21, 2006
  4. Petr BaudisMar 21, 2006
  5. Pavel RoskinMar 22, 2006

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.