From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: Jonathan Nieder <jrnieder@gmail.com>
Cc: Osamu OKANO <okano.osamu@gmail.com>,
Junio C Hamano <gitster@pobox.com>,
git@vger.kernel.org
Subject: Re: [PATCH 6/7] update git-stage.po
Date: Sun, 15 May 2011 14:51:07 +0200 [thread overview]
Message-ID: <BANLkTin+oceG32Xr9J+f3Kmf05P_MdDgeA@mail.gmail.com> (raw)
In-Reply-To: <20110514192154.GA17271@elie>
On Sat, May 14, 2011 at 21:21, Jonathan Nieder <jrnieder@gmail.com> wrote:
> 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. :)
We went over this for the main gettext series. Not commiting the line
numbers is unworkable, because it means that users who check out
git.git can't run msgmerge, because it completely fails without line
numbers.
Having a merge strategy to deal with them would be nice, but that can
be done by using the existing gitattributes config + msgmerge(1) to do
the work.
next prev parent reply other threads:[~2011-05-15 12:51 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-13 13:14 [PATCH 0/7] Document translation with po4a Osamu OKANO
2011-05-13 13:14 ` [PATCH 1/7] Add new target pot in Makefile Osamu OKANO
2011-05-13 13:14 ` [PATCH 2/7] add make(shell) scripts Osamu OKANO
2011-05-13 13:14 ` [PATCH 3/7] cp git-stage.pot ja/git-stage.po Osamu OKANO
2011-05-13 13:14 ` [PATCH 4/7] translate ja/git-stage.po Osamu OKANO
2011-05-13 13:14 ` [PATCH 5/7] your file Osamu OKANO
2011-05-13 16:52 ` Junio C Hamano
2011-05-13 16:58 ` Drew Northup
2011-05-13 13:14 ` [PATCH 6/7] update git-stage.po Osamu OKANO
2011-05-13 16:53 ` Junio C Hamano
2011-05-14 13:36 ` Osamu OKANO
2011-05-14 19:21 ` Jonathan Nieder
2011-05-15 3:21 ` Junio C Hamano
2011-05-15 3:44 ` Jonathan Nieder
2011-05-15 12:51 ` Ævar Arnfjörð Bjarmason [this message]
2011-05-15 12:56 ` Jonathan Nieder
2011-05-15 13:08 ` Jonathan Nieder
2011-05-15 13:25 ` Ævar Arnfjörð Bjarmason
2011-05-15 13:51 ` Jonathan Nieder
2011-05-13 13:14 ` [PATCH 7/7] translate and remove fazzy Osamu OKANO
2011-05-13 16:48 ` [PATCH 0/7] Document translation with po4a Junio C Hamano
2011-05-14 9:14 ` Ævar Arnfjörð Bjarmason
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=BANLkTin+oceG32Xr9J+f3Kmf05P_MdDgeA@mail.gmail.com \
--to=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.com \
--cc=okano.osamu@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).