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

Re: [PATCH] parse-opt: migrate fmt-merge-msg.

From
Shawn O. Pearce <spearce@spearce.org>
Date
Sep 30, 2008, 22:46 UTC
Message-ID
<20080930224623.GQ21310@spearce.org>
In-Reply-To
<20080930211643.GA16879@artemis.corp>
Pierre Habouzit <madcoder@debian.org> wrote:
Show 12 quoted lines
> On Tue, Sep 30, 2008 at 07:10:14PM +0000, Shawn O. Pearce wrote:
> > Pierre Habouzit <madcoder@debian.org> wrote:
> > > On Mon, Sep 29, 2008 at 04:35:23PM +0000, Shawn O. Pearce wrote:
> > > > Pierre Habouzit <madcoder@debian.org> wrote:
> > > > > Also fix an inefficient printf("%s", ...) where we can use write_in_full.
> > 
> > I'd appreciate an updated series if you can send it.  am -3 isn't
> > "easily" applying it.
> 
> Okay, I will then, but FWIW it means that when you'll try to merge this
> in next it'll conflict at that time, so I'm not sure there's a huge win
> for you at that point.
It may actually be a good idea to rebase this against master.

Reading Junio's notes for sg/merge-options (the branch this conflict is coming out of) it sounds like we'd want to revert that anyway. Its been around since April and Junio was talking about it needing to be in a 1.7.0 release. Its not going to graduate anytime soon.

IOW I'm quite tempted to revert sg/merge-options and cancel the branch out of next.

-- 
Shawn.
Previous: Pierre HabouzitNext: Pierre Habouzit
Message 9 of 19 in “small warm-up: easy parse-opt migrations.”
  1. Pierre HabouzitSep 28, 2008
  2. parse-opt: migrate fmt-merge-msg.Pierre Habouzit, Sep 28, 2008
  3. parse-opt: migrate git-merge-base.Pierre Habouzit, Sep 28, 2008
  4. parse-opt: migrate builtin-merge-file.Pierre Habouzit, Sep 28, 2008
  5. Shawn O. PearceSep 29, 2008
  6. Pierre HabouzitSep 30, 2008
  7. Shawn O. PearceSep 30, 2008
  8. Pierre HabouzitSep 30, 2008
  9. Shawn O. PearceSep 30, 2008
  10. 1/3 parse-opt: migrate fmt-merge-msg.Pierre Habouzit, Oct 1, 2008
  11. 2/3 parse-opt: migrate git-merge-base.Pierre Habouzit, Oct 1, 2008
  12. 3/3 parse-opt: migrate builtin-merge-file.Pierre Habouzit, Oct 1, 2008
  13. Shawn O. PearceOct 1, 2008
  14. Shawn O. PearceOct 1, 2008
  15. Pierre HabouzitOct 2, 2008
  16. parse-opt: migrate fmt-merge-msg.Pierre Habouzit, Oct 2, 2008
  17. parse-opt: migrate git-merge-base.Pierre Habouzit, Oct 2, 2008
  18. parse-opt: migrate builtin-merge-file.Pierre Habouzit, Oct 2, 2008
  19. Sverre RabbelierSep 28, 2008

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.