Received: from spf3.us4.outblaze.com (spf3.us4.outblaze.com [205.158.62.25]) by sdf.lonestar.org (8.12.10/8.12.10) with ESMTP id iAMBNDhL029684 for ; Mon, 22 Nov 2004 11:23:13 GMT Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) by spf3.us4.outblaze.com (Postfix) with ESMTP id 78AAE54806 for ; Mon, 22 Nov 2004 11:23:13 +0000 (GMT) Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.33) id 1CWCQs-0001l8-Bw for migo@homemail.com; Mon, 22 Nov 2004 06:32:34 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33) id 1CWCMC-0000s6-Fg for gnu-arch-users@gnu.org; Mon, 22 Nov 2004 06:27:44 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33) id 1CWCM9-0000ps-Sr for gnu-arch-users@gnu.org; Mon, 22 Nov 2004 06:27:42 -0500 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.33) id 1CWCM9-0000on-5H for gnu-arch-users@gnu.org; Mon, 22 Nov 2004 06:27:41 -0500 Received: from [193.131.176.58] (helo=cam-admin0.cambridge.arm.com) by monty-python.gnu.org with esmtp (Exim 4.34) id 1CWCCj-0001Ne-F9 for gnu-arch-users@gnu.org; Mon, 22 Nov 2004 06:18:02 -0500 Received: from cam-mail2.cambridge.arm.com (cam-mail2.cambridge.arm.com [10.1.127.39]) by cam-admin0.cambridge.arm.com (8.12.10/8.12.10) with ESMTP id iAMBHBso025603; Mon, 22 Nov 2004 11:17:11 GMT Received: from localhost.localdomain (cmarinas@pc1117.cambridge.arm.com [10.1.69.160]) by cam-mail2.cambridge.arm.com (8.9.3/8.9.3) with ESMTP id LAA24455; Mon, 22 Nov 2004 11:17:52 GMT To: gnu-arch-users@gnu.org From: Catalin Marinas Date: Mon, 22 Nov 2004 11:18:51 +0000 Message-ID: User-Agent: Gnus/5.1006 (Gnus v5.10.6) Emacs/21.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Subject: [Gnu-arch-users] Multiple id's for a file X-BeenThere: gnu-arch-users@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: a discussion list for all things arch-ish List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: gnu-arch-users-bounces+migo=homemail.com@gnu.org Errors-To: gnu-arch-users-bounces+migo=homemail.com@gnu.org Status: RO Content-Length: 1268 Lines: 31 Hi, Going back to the problem of tracking changes to a non-arch repository. I track the Linux kernel releases in a local arch tree from which I branch and do my development. It happens quite often to add new files (mine or others) to my branch which will make their way into the mainline kernel. In my mainline kernel arch repository the files would appear with a different id. The situation is simpler if I add a tag to the files written by me but it doesn't solve those taken from others. A solution is to copy the id's from my branch to the newly added files in the mainline tree but this cannot be achieved if I would use a public arch repository of the mainline kernel. For this situation, it would make sense to have multiple ids for a file. When my file is added to the mainline tree, I could simply add its id to the existing id and the merging would preserve the history for that file (it would report a conflict at the first merge but it's still better than removing the file in my branch and re-adding it with a different id). Catalin _______________________________________________ Gnu-arch-users mailing list Gnu-arch-users@gnu.org http://lists.gnu.org/mailman/listinfo/gnu-arch-users GNU arch home page: http://savannah.gnu.org/projects/gnu-arch/