From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.176.0/21 X-Spam-Status: No, score=-3.5 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MSGID_FROM_MTA_HEADER,RP_MATCHES_RCVD shortcircuit=no autolearn=ham autolearn_force=no version=3.4.0 From: Aaron Bentley Subject: Re: git and bzr Date: Tue, 28 Nov 2006 13:31:56 -0500 Message-ID: <456C809C.3050503@utoronto.ca> References: <45357CC3.4040507@utoronto.ca> <87slhcz8zh.wl%cworth@cworth.org> <7vu01ro20b.fsf@assigned-by-dhcp.cox.net> <20061026101038.GA13310@coredump.intra.peff.net> <877iyne4dm.fsf@alplog.fr> <456B7C6A.80104@webdrake.net> <845b6e870611280410j58bdcd99nc05d0f67489293e4@mail.gmail.com> <456C6CBB.70702@utoronto.ca> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit NNTP-Posting-Date: Tue, 28 Nov 2006 18:32:51 +0000 (UTC) Cc: bazaar-ng@lists.canonical.com, git@vger.kernel.org Return-path: Envelope-to: gcvg-git@gmane.org User-Agent: Debian Thunderbird 1.0.2 (X11/20060926) X-Accept-Language: en-us, en In-Reply-To: X-Enigmail-Version: 0.91.0.0 X-Panometrics-MailScanner: Found to be clean Precedence: bulk X-Mailing-List: git@vger.kernel.org Archived-At: Received: from vger.kernel.org ([209.132.176.167]) by ciao.gmane.org with esmtp (Exim 4.43) id 1Gp7kd-0007bA-30 for gcvg-git@gmane.org; Tue, 28 Nov 2006 19:32:15 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758733AbWK1ScL (ORCPT ); Tue, 28 Nov 2006 13:32:11 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1758734AbWK1ScL (ORCPT ); Tue, 28 Nov 2006 13:32:11 -0500 Received: from server4.panoramicfeedback.com ([66.216.124.41]:5052 "EHLO server4.panoramicfeedback.com") by vger.kernel.org with ESMTP id S1758733AbWK1ScJ (ORCPT ); Tue, 28 Nov 2006 13:32:09 -0500 Received: from server4.panoramicfeedback.com ([66.216.124.41] helo=[192.168.2.19]) by server4.panoramicfeedback.com with esmtp (Exim 3.36 #1 (Debian)) id 1Gp7kT-00041i-00; Tue, 28 Nov 2006 13:32:06 -0500 To: Jakub Narebski Sender: git-owner@vger.kernel.org -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Jakub Narebski wrote: >>I notice that blame has an option to limit the annotation to recent >>history. I can only assume that is for performance reasons. bzr >>annotate doesn't need a feature like that, because annotations are >>explicit in bzr's storage format. > > > But you don't have content movement tracking. > > >> I expect that even if we were to >>extend annotate to track content across files, it would still be so fast >>that we wouldn't need it. > > > I think not. There's no question that determining content movement could involve opening a lot of revisions, but you wouldn't need to examine: 1. revisions that didn't alter any lines being examined 2. revisions that altered only the file in question 3. revisions with multiple parents, because any lines attributed to that merge will be the outcome of conflict resolution. (Other lines will be attributed to one of the parents) I'll admit though, that when I was thinking of this, I was thinking of annotation-based merging, a scenario in which the number of lines being examined is typically extremely low. Aaron -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org iD8DBQFFbICL0F+nu1YWqI0RAhaXAJ9tqw/J17oKDV0nnuPlputs1PHBIgCghs6K q++u4Z9OFGwziUBsnW08y0U= =tmqe