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

Re: [PATCH 6/7] update git-stage.po

From
Junio C Hamano <gitster@pobox.com>
Date
May 15, 2011, 03:21 UTC
Message-ID
<7vd3jkr6ms.fsf@alter.siamese.dyndns.org>
In-Reply-To
<20110514192154.GA17271@elie>
Jonathan Nieder <jrnieder@gmail.com> writes:
Show 5 quoted lines
> Another thought I have had occasionally is that it would be nice if
> the versions committed did not have line numbers while the working
> copy had line numbers, so an ordinary 3-way merge could be more likely
> to work for integrating changes[1].  But this second thought is less
> fully cooked. :)

I would rather see that done as a customized content-level merge backend, i.e. at the same level as binary and union merges are specified. Losing line number information just for the sake of the generic merge that does not have domain knowledge (read: "stupid") is a way suboptimal solution to the problem, I would think.

Previous: Jonathan NiederNext: Jonathan Nieder
Message 13 of 22 in “Document translation with po4a.”
  1. 0/7 Document translation with po4a.Osamu OKANO, May 13, 2011
  2. 1/7 Add new target pot in MakefileOsamu OKANO, May 13, 2011
  3. 2/7 add make(shell) scriptsOsamu OKANO, May 13, 2011
  4. 3/7 cp git-stage.pot ja/git-stage.poOsamu OKANO, May 13, 2011
  5. 4/7 translate ja/git-stage.poOsamu OKANO, May 13, 2011
  6. 5/7 your fileOsamu OKANO, May 13, 2011
  7. Junio C HamanoMay 13, 2011
  8. Drew NorthupMay 13, 2011
  9. 6/7 update git-stage.poOsamu OKANO, May 13, 2011
  10. Junio C HamanoMay 13, 2011
  11. Osamu OKANOMay 14, 2011
  12. Jonathan NiederMay 14, 2011
  13. Junio C HamanoMay 15, 2011
  14. Jonathan NiederMay 15, 2011
  15. Ævar Arnfjörð BjarmasonMay 15, 2011
  16. Jonathan NiederMay 15, 2011
  17. Jonathan NiederMay 15, 2011
  18. Ævar Arnfjörð BjarmasonMay 15, 2011
  19. Jonathan NiederMay 15, 2011
  20. 7/7 translate and remove fazzyOsamu OKANO, May 13, 2011
  21. Junio C HamanoMay 13, 2011
  22. Ævar Arnfjörð BjarmasonMay 14, 2011

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.