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

Re: TopGit: how to deal with upstream inclusion

From
MKmartin f krafft <madduck@madduck.net>
Date
Sep 24, 2008, 11:21 UTC
Message-ID
<20080924112115.GA14841@piper.oerlikon.madduck.net>
In-Reply-To
<20080923095528.GR10360@machine.or.cz>
also sprach Petr Baudis <pasky@suse.cz> [2008.09.23.1155 +0200]:
Show 8 quoted lines
> > Well, but what if upstream implemented our solution slightly
> > differently, and if it's only because they used tabs instead of
> > spaces? We wouldn't want -s ours then, huh?
> 
> You still would want to get tabs in other patches that depended on
> the merged one, no? Otherwise tg patch output will produce patches
> that do not apply and tg export will change the tabs back to
> spaces.

I would want to have to resolve all dependent branches and change them to use tabs, right. But since I used spaces and they used tabs, using -s ours would give preference to spaces, no?

-- 
martin | http://madduck.net/ | http://two.sentenc.es/
 
the reason the mainstream is thought of as a stream
is because it is so shallow.
 
spamtraps: madduck.bogus@madduck.net
Previous: Petr BaudisNext: Petr Baudis
Message 7 of 9 in “TopGit: how to deal with upstream inclusion”
  1. martin f krafftSep 14, 2008
  2. Petr BaudisSep 14, 2008
  3. martin f krafftSep 19, 2008
  4. Petr BaudisSep 21, 2008
  5. martin f krafftSep 23, 2008
  6. Petr BaudisSep 23, 2008
  7. martin f krafftSep 24, 2008
  8. Petr BaudisSep 24, 2008
  9. martin f krafftSep 24, 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.