From users-return-1119-daniel=haxx.se@subversion.apache.org Fri Feb 19 20:48:38 2010 Return-Path: Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by giant.haxx.se (8.14.3/8.14.3/Debian-9) with SMTP id o1JJmb6U032141 for ; Fri, 19 Feb 2010 20:48:37 +0100 Received: (qmail 82137 invoked by uid 500); 19 Feb 2010 19:48:32 -0000 Mailing-List: contact users-help@subversion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list users@subversion.apache.org Delivered-To: moderator for users@subversion.apache.org Received: (qmail 81714 invoked by uid 99); 19 Feb 2010 19:47:43 -0000 X-ASF-Spam-Status: No, hits=1.2 required=10.0 tests=SPF_NEUTRAL X-Spam-Check-By: apache.org Received-SPF: neutral (nike.apache.org: local policy) Message-ID: <4B7EEABB.3000800@sri.com> Date: Fri, 19 Feb 2010 12:47:07 -0700 From: Chris Jones User-Agent: Thunderbird 2.0.0.23 (Windows/20090812) MIME-Version: 1.0 To: users@subversion.apache.org Subject: merge is silently changing svn:mergeinfo on unrelated files Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-Virus-Checked: Checked by ClamAV on apache.org I have two branches, release and patches. Release was made in rev 2120 by copying HEAD of trunk. Patches was made in rev 2138 by copying HEAD of release -- release had no changes between 2120 and 2138. Now I'm merging changes from trunk into patches, with the intent of vetting these and bringing them up to release. I'm merging from my working copy trunk onto my working copy patches. The first merge I did was using TortoiseSVN 1.6.7, merging the change in rev 2121. Tortoise did that correctly, but it also silently modified svn:mergeinfo on an unrelated set of 7 files. I reverted the erroneous properties, then committed the results of this merge as rev 2140. This commit consisted of changes to one source file, plus property changes to the patches directory. Now I'm using CollabNet svn 1.6.9, trying to do more merges, but it's showing the same incorrect behavior: C:\project> svn merge -r 2124:2126 trunk branches/patches --- Merging r2125 through r2126 into 'branches\patches': U branches\patches\file1 Now file1 is correctly patched, waiting for commit. Also, the patches dir shows what I think are the correct property changes. But the same set of unrelated files have svn:mergeinfo changes. My server is running SVN 1.5.2. Am I misunderstanding something about how merge is supposed to operate? Why is it pulling in these unrelated files and marking their svn:mergeinfo properties? Chris