From owner-freebsd-hackers@FreeBSD.ORG Fri Dec 12 11:45:47 2008 Return-Path: Delivered-To: freebsd-hackers@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 46F1E1065670 for ; Fri, 12 Dec 2008 11:45:47 +0000 (UTC) (envelope-from artis.caune@gmail.com) Received: from an-out-0708.google.com (an-out-0708.google.com [209.85.132.244]) by mx1.freebsd.org (Postfix) with ESMTP id 014638FC13 for ; Fri, 12 Dec 2008 11:45:46 +0000 (UTC) (envelope-from artis.caune@gmail.com) Received: by an-out-0708.google.com with SMTP id c2so491994anc.13 for ; Fri, 12 Dec 2008 03:45:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:message-id:date:from:to :subject:mime-version:content-type:content-transfer-encoding :content-disposition; bh=Y1gu3N9IAltWT8Nr6zxPQT8RRqN9y56+1yaoBmSFGhY=; b=kGjNDXbDdj43fRktD1b4PwTcS+P1MNZAq1DB5Lr8L4rUNUranf+58DBrJCYzk27n+m NE+7rK0t/ya8Z+ZkQW64hu85tXkJQMBiizWsoI04bb2TuE3rLNRQJbUrqU9RvKgQMpjv I5KbPtkCT4bdLl+w950vB3HF20G3OOsCwxQvk= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:to:subject:mime-version:content-type :content-transfer-encoding:content-disposition; b=B7JjxAtDBec3jf0/vqFFoJ5YwiJmtdWaAZW8M52tSv5efk7lDBhUSz7O0B7qlV2lpk dQTzrjxCADyC5vdJKI/RisU0oO1eA8JjCBuevgLIOrlggKltDAxIhfGpaq9tV1/aCVAt umRx9NHxeETNE/XUoLbfFt8swRlS6G1o6Y/K4= Received: by 10.100.166.10 with SMTP id o10mr2760627ane.126.1229080517559; Fri, 12 Dec 2008 03:15:17 -0800 (PST) Received: by 10.100.112.8 with HTTP; Fri, 12 Dec 2008 03:15:17 -0800 (PST) Message-ID: <9e20d71e0812120315l30d72b2doc899a8163fde829f@mail.gmail.com> Date: Fri, 12 Dec 2008 13:15:17 +0200 From: "Artis Caune" To: freebsd-hackers@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Content-Disposition: inline Subject: Strange "changed paths" in svn commits X-BeenThere: freebsd-hackers@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Technical Discussions relating to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Dec 2008 11:45:47 -0000 Hi, Is it how merging works or I'm missing something? Why /stable/7/sys and /stable/7/sys/contrib/pf are in changed paths in commit r185814? Starting from 2008 Aug they appear in almost all commits to stable/7. # svn log -v svn://svn.freebsd.org/base/stable/7 -r185814 Changed paths: M /stable/7/sys M /stable/7/sys/contrib/pf M /stable/7/sys/netinet/in_pcb.h Merge r185791 from head to stable/7: # svn diff svn://svn.freebsd.org/base/stable/7 -r185805:185814 ... diff to in_pcb.h ... Property changes on: sys/contrib/pf ___________________________________________________________________ Modified: svn:mergeinfo Merged /head/sys/contrib/pf:r185791 Property changes on: sys ___________________________________________________________________ Modified: svn:mergeinfo Merged /head/sys:r185791 # svn log -v svn://svn.freebsd.org/base/head -r185791 ------------------------------------------------------------------------ Changed paths: M /head/sys/netinet/in_pcb.h -- regards, Artis Caune <----. CCNA | BSDA <----|==================== <----' didii FreeBSD