From mboxrd@z Thu Jan  1 00:00:00 1970
Path: news.gmane.org!not-for-mail
From: Stefan Monnier <monnier@iro.umontreal.ca>
Newsgroups: gmane.emacs.help
Subject: Re: Automatically commenting changes
Date: Wed, 26 Jan 2011 10:55:40 -0500
Organization: A noiseless patient Spider
Message-ID: <jwvwrlroe3x.fsf-monnier+gnu.emacs.help@gnu.org>
References: <mailman.1.1295948439.29299.help-gnu-emacs@gnu.org>
	<jwv8vy8pch3.fsf-monnier+gnu.emacs.help@gnu.org>
	<mailman.0.1296048116.12534.help-gnu-emacs@gnu.org>
NNTP-Posting-Host: lo.gmane.org
Mime-Version: 1.0
Content-Type: text/plain
X-Trace: dough.gmane.org 1296061936 9887 80.91.229.12 (26 Jan 2011 17:12:16 GMT)
X-Complaints-To: usenet@dough.gmane.org
NNTP-Posting-Date: Wed, 26 Jan 2011 17:12:16 +0000 (UTC)
To: help-gnu-emacs@gnu.org
Original-X-From: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org Wed Jan 26 18:12:12 2011
Return-path: <help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org>
Envelope-to: geh-help-gnu-emacs@m.gmane.org
Original-Received: from lists.gnu.org ([199.232.76.165])
	by lo.gmane.org with esmtp (Exim 4.69)
	(envelope-from <help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org>)
	id 1Pi8uh-0000IH-Pt
	for geh-help-gnu-emacs@m.gmane.org; Wed, 26 Jan 2011 18:12:11 +0100
Original-Received: from localhost ([127.0.0.1]:55130 helo=lists.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43)
	id 1Pi8R0-0002bQ-AZ
	for geh-help-gnu-emacs@m.gmane.org; Wed, 26 Jan 2011 11:41:30 -0500
Original-Path: usenet.stanford.edu!news.tele.dk!news.tele.dk!small.news.tele.dk!newsfeed00.sul.t-online.de!t-online.de!news.buerger.net!newsfeed.datemas.de!eternal-september.org!feeder.eternal-september.org!.POSTED!not-for-mail
Original-Newsgroups: gnu.emacs.help
Original-Lines: 13
Injection-Info: mx02.eternal-september.org;
	posting-host="cDuFTaxWZtHn7h45EreUyw"; 
	logging-data="4103"; mail-complaints-to="abuse@eternal-september.org";
	posting-account="U2FsdGVkX1+/PuJue4w/GZ8miJpW8SWd"
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (gnu/linux)
Cancel-Lock: sha1:wPPJGEDXMqhL9liHNJI2c5PK2og=
	sha1:CELNcjFSHPeQ9g8JPGNchRztosg=
Original-Xref: usenet.stanford.edu gnu.emacs.help:184604
X-BeenThere: help-gnu-emacs@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Users list for the GNU Emacs text editor <help-gnu-emacs.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/help-gnu-emacs>,
	<mailto:help-gnu-emacs-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/help-gnu-emacs>
List-Post: <mailto:help-gnu-emacs@gnu.org>
List-Help: <mailto:help-gnu-emacs-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/help-gnu-emacs>,
	<mailto:help-gnu-emacs-request@gnu.org?subject=subscribe>
Original-Sender: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org
Errors-To: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org
Xref: news.gmane.org gmane.emacs.help:78767
Archived-At: <http://permalink.gmane.org/gmane.emacs.help/78767>

> I do. But before I commit, or rather in the process of commiting, when
> there is the original file I branched from to consider, plus my changes,
> possibly plus changes from others who have commited since I branched,
> things can get confusing.

The VCS is keeping track of who modified which lines, so the information
is available.  Maybe the problem is that your VCS or Emacs's
presentation of it doesn't show you the info in a clear enough manner.
If you have a concrete case where the info displayed is not clear
enough, maybe we can figure out how to improve it.


        Stefan