all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: David Kastrup <dak@gnu.org>
To: emacs-devel@gnu.org
Subject: Re: Automatically marking conflicts are resolved
Date: Tue, 07 Jan 2014 13:34:26 +0100	[thread overview]
Message-ID: <87eh4kq8bx.fsf@fencepost.gnu.org> (raw)
In-Reply-To: 87k3ec59yt.fsf@wanadoo.es

Óscar Fuentes <ofv@wanadoo.es> writes:

> David Kastrup <dak@gnu.org> writes:
>
>>> That's not enough and too late. I wont commit the merge without testing
>>> it first and meanwhile a clear separation of conflicted areas is useful.
>>
>> Uh, why would that be too late?  Before committing the merge, git diff
>> lists all merge conflicts.  After committing the merge, the information
>> is in the commit message.  The commit can still be amended.
>>
>> Whether or not you choose to commit first, test later (after all, a
>> commit is not the same as an upstream push and can always be amended) or
>> test first, commit later, the information is readily available.
>
> I'm wary of using commits as temporary storage for work-in-progress on
> merges or any other atomic change.

So what?  I repeat: at no point of time does the information become
unavailable.

> A distraction at the wrong moment may cause big trouble. There is a
> policy here that says that, except for experimental throw-away
> projects, all changes must pass some tests before committing them.

You are confused.  A "policy" cannot cover what may be _committed_ since
commits are private to each user.  A policy can only cover what is
_pushed_ to a central resource.

> Also it is convenient to have the diff updated as you work on fixing
> the merge, with the merge-specific diff indicators.

So what?  Fix a file, git add it, and it disappears from the diff (which
shows the difference between index and work directory by default)
without affecting the state of the repository.

-- 
David Kastrup




  reply	other threads:[~2014-01-07 12:34 UTC|newest]

Thread overview: 61+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-01-06 16:51 Move to git is imminent - awaiting Stefan's approval Eric S. Raymond
2014-01-06 17:20 ` Jay Belanger
2014-01-06 19:40   ` Eric S. Raymond
2014-01-07 15:57     ` Jay Belanger
2014-01-07 11:20   ` Stephen J. Turnbull
2014-01-07 11:26     ` Eric S. Raymond
2014-01-06 17:30 ` Eli Zaretskii
2014-01-06 21:09   ` Stefan Monnier
2014-01-06 21:29     ` Óscar Fuentes
2014-01-06 23:57       ` Stefan Monnier
2014-01-07  0:20         ` Automatically marking conflicts are resolved (was: Move to git is imminent - awaiting Stefan's approval) Óscar Fuentes
2014-01-07  0:43           ` Automatically marking conflicts are resolved David Kastrup
2014-01-07  0:51             ` Óscar Fuentes
2014-01-07  8:33               ` David Kastrup
2014-01-07 11:04                 ` Óscar Fuentes
2014-01-07 12:34                   ` David Kastrup [this message]
2014-01-07 13:06                     ` Óscar Fuentes
2014-01-07 13:07                   ` Stephen J. Turnbull
2014-01-07  0:17     ` Move to git is imminent - awaiting Stefan's approval Leo Liu
2014-01-07  5:24     ` Thierry Volpiatto
2014-01-07 13:45       ` Stefan Monnier
2014-01-07 16:22         ` Eli Zaretskii
2014-01-08 21:12     ` Barry Warsaw
2014-01-09  0:04       ` Stefan Monnier
2014-01-09  6:32         ` Eli Zaretskii
2014-01-09  7:32           ` David Engster
2014-01-09  9:46           ` Juanma Barranquero
2014-01-06 17:40 ` Juanma Barranquero
2014-01-06 18:42   ` Bastien
2014-01-06 19:06     ` Jarek Czekalski
2014-01-06 19:37   ` Drew Adams
2014-01-06 19:42   ` Eric S. Raymond
2014-01-06 19:51     ` Drew Adams
2014-01-06 20:25       ` Eric S. Raymond
2014-01-06 20:28     ` Juanma Barranquero
2014-01-07 11:24     ` Stephen J. Turnbull
2014-01-06 17:49 ` Move to git is not imminent - esr is just tired of talking about it Jordi Gutiérrez Hermoso
2014-01-06 18:18   ` Daniel Colascione
2014-01-06 18:39     ` Jay Belanger
2014-01-06 18:41     ` Juanma Barranquero
2014-01-06 20:06       ` Karl Fogel
2014-01-06 20:26         ` Juanma Barranquero
2014-01-06 22:12           ` Karl Fogel
2014-01-06 22:15             ` Juanma Barranquero
2014-01-07 16:53           ` Richard Stallman
2014-01-07 21:08             ` Juanma Barranquero
2014-01-08  1:19             ` Bob Bobeck
2014-01-06 18:23   ` Drew Adams
2014-01-06 23:06     ` Werner LEMBERG
2014-01-06 19:10   ` David Kastrup
2014-01-06 19:30     ` Drew Adams
2014-01-06 20:32   ` Juanma Barranquero
2014-01-07  2:48 ` Move to git is imminent - awaiting Stefan's approval joakim
2014-01-07 10:03   ` Andreas Schwab
2014-01-07 10:08     ` joakim
2014-01-15 17:23 ` Martin Geisler
2014-01-15 18:39   ` Stefan Monnier
2014-01-15 22:57     ` Martin Geisler
2014-01-15 23:53       ` Stefan Monnier
2014-01-16 12:25       ` Rüdiger Sonderfeld
2014-01-16  1:40   ` Yuri Khan

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=87eh4kq8bx.fsf@fencepost.gnu.org \
    --to=dak@gnu.org \
    --cc=emacs-devel@gnu.org \
    /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.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/emacs.git
	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.