From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jonathan Nieder <jrnieder@gmail.com>
Subject: Re: [PATCH 17/18] revert: Don't implictly stomp pending sequencer
 operation
Date: Wed, 27 Jul 2011 07:19:47 +0200
Message-ID: <20110727051947.GL18470@elie>
References: <1311736755-24205-1-git-send-email-artagnon@gmail.com>
 <1311736755-24205-18-git-send-email-artagnon@gmail.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Cc: Git List <git@vger.kernel.org>, Junio C Hamano <gitster@pobox.com>,
	Christian Couder <chriscool@tuxfamily.org>,
	Daniel Barkalow <barkalow@iabervon.org>,
	Jeff King <peff@peff.net>
To: Ramkumar Ramachandra <artagnon@gmail.com>
X-From: git-owner@vger.kernel.org Wed Jul 27 07:20:07 2011
Return-path: <git-owner@vger.kernel.org>
Envelope-to: gcvg-git-2@lo.gmane.org
Received: from vger.kernel.org ([209.132.180.67])
	by lo.gmane.org with esmtp (Exim 4.69)
	(envelope-from <git-owner@vger.kernel.org>)
	id 1QlwXL-00077Q-0q
	for gcvg-git-2@lo.gmane.org; Wed, 27 Jul 2011 07:20:03 +0200
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1752021Ab1G0FT7 (ORCPT <rfc822;gcvg-git-2@m.gmane.org>);
	Wed, 27 Jul 2011 01:19:59 -0400
Received: from mail-ew0-f46.google.com ([209.85.215.46]:50885 "EHLO
	mail-ew0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1751313Ab1G0FT5 (ORCPT <rfc822;git@vger.kernel.org>);
	Wed, 27 Jul 2011 01:19:57 -0400
Received: by ewy4 with SMTP id 4so1045778ewy.19
        for <git@vger.kernel.org>; Tue, 26 Jul 2011 22:19:56 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=gmail.com; s=gamma;
        h=date:from:to:cc:subject:message-id:references:mime-version
         :content-type:content-disposition:in-reply-to:user-agent;
        bh=MgjTvNBm1alrHXeneFU0d+/5hULecYJXmUU75tYvMpE=;
        b=tawqL9ld7Tv9lQ3poT7OvaeteQHuUqmSulX45aMHOl4UW20GEH0ZkvHC8195+0cFl4
         982IsoNIfvbABtLSkLG6XSCYt3tJbsHqkjDYTMXtKLzT3mEujkOHKij9CgzMD6qp24Rn
         BxQlxya/idsLkdApg43IqsadVWKPvz6hh+24Q=
Received: by 10.213.2.70 with SMTP id 6mr2631309ebi.23.1311743996339;
        Tue, 26 Jul 2011 22:19:56 -0700 (PDT)
Received: from elie (adsl-165-157-240.teol.net [109.165.157.240])
        by mx.google.com with ESMTPS id n41sm831283eeh.57.2011.07.26.22.19.54
        (version=SSLv3 cipher=OTHER);
        Tue, 26 Jul 2011 22:19:55 -0700 (PDT)
Content-Disposition: inline
In-Reply-To: <1311736755-24205-18-git-send-email-artagnon@gmail.com>
User-Agent: Mutt/1.5.21+46 (b01d63af6fea) (2011-07-01)
Sender: git-owner@vger.kernel.org
Precedence: bulk
List-ID: <git.vger.kernel.org>
X-Mailing-List: git@vger.kernel.org
Archived-At: <http://permalink.gmane.org/gmane.comp.version-control.git/177934>

Ramkumar Ramachandra wrote:

[...]
> +		if (create_seq_dir() < 0) {
> +			advise(_("A cherry-pick or revert is in progress."));
> +			advise(_("Use --reset to forget about it"));
> +			return -1;
> +		}

The usual formula is:

	error(... description of error ...)
	if (advice_foo_bar [i.e., if the user is not tired of the advice already]) {
		advise(... how to recover from error ...);
		advise(... more lines ...);
	}