[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: mergeinfo properties getting carried around, makes for confusing merges

From: Pat Farrell <pfarrell_at_pfarrell.com>
Date: Mon, 09 Nov 2009 18:46:24 -0500

Bob Archer wrote:
>> to be able to give a number for. One of them is that "svn copy"
>> adds empty svn:mergeinfo properties. These then grow with every
>> checkout.
>
> This was fixed in 1.5.5 according to the CHANGES log.
>
> However, I would get any clients up to 1.6.6.

can you be a bit more specific on what "that" was?
The generation of the spurious mergeinfo? or deleteing it? or ???

I've upgraded my client to 1.6.6
and svn status shows the file as being changed (due to bogus mergeinfo)
svn diff lists the merge info.

But, svn propdel svn:mergeinfo -R fails

Logs from my console below.

Pat

svn --version
svn, version 1.6.6 (r40053)
   compiled Oct 16 2009, 00:53:27

Copyright (C) 2000-2009 CollabNet.
Subversion is open source software, see http://subversion.tigris.org/
This product includes software developed by CollabNet
(http://www.Collab.Net/).

pfarrell_at_tools:~/sandbox/bbook/branches/pat/fnflib/src/com/fnfbook/synthobj$
svn status
 M VCard.java
pfarrell_at_tools:~/sandbox/bbook/branches/pat/fnflib/src/com/fnfbook/synthobj$
svn diff

Property changes on: VCard.java
___________________________________________________________________
Deleted: svn:mergeinfo
   Reverse-merged
/bbook/branches/scott/fnflib/src/com/fnfbook/synthobj/VCard.java:r5326-5467
   Reverse-merged /bbook/trunk/fnflib/src/com/fnfbook/utils/VCard.java:r3351
   Reverse-merged
/bbook/trunk/trunk/fnflib/src/com/fnfbook/utils/VCard.java:r4195-4223
   Reverse-merged
/bbook/branches/pat/fnflib/src/com/fnfbook/synthobj/VCard.java:r4482-4490,4493-4515,4518-4549,4553-4577,4580-4590,4593-4611,4614-4618,4623-4624,4637-4669,4673-4685,4689-4714,4717-4748,4751-4774,4777-4781,4784-4805,4808-4827,4830-4857,4860-4876,4879-4915,4919-4931,4934-5071,5074-5114,5117-5145,5148-5156,5160-5170,5182-5198,5201-5204,5207-5221,5224-5248,5258-5264,5393-5429,5432-5454,5473-5503
   Reverse-merged
/bbook/branches/pat/fnflib/src/com/fnfbook/utils/VCard.java:r4196-4221,4225-4238,4246-4316,4320-4326,4329-4366,4369-4373,4378-4383,4389-4399

pfarrell_at_tools:~/sandbox/bbook/branches/pat/fnflib/src/com/fnfbook/synthobj$
svn propdel svn:mergeinfo -R
svn: Attempting to delete nonexistent property 'svn:mergeinfo'

-- 
Pat Farrell
http://www.pfarrell.com/
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2415961
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-11-10 00:47:11 CET

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.