Piwigo.org

plg · 2010-05-24 16:53:51

Hi Piwigo coding team,

I use a script to backport a commit from a branch to another.

Now that the Subversion server was upgraded to SVN 1.5.1, it supports the "mergeinfo" (for merge tracking) feature. Each time I use my backport.pl script or if I simply perform a:

Code:

svn merge -c6265 http://piwigo.org/svn/trunk .

I get many file with SVN properties changed svn:mergeinfo. this is quite annoying and it seems that not so many files should have their svn:mergeinfo updated, this is a bug fixed in Subversion client 1.5.5.

rvelices, on [Subversion] r6238 you say you had to perform the merge "manually". Can you describe what was the problem and what is your coding environment? (which is your Subversion client)

rvelices · 2010-05-24 19:58:41

plg wrote:
rvelices, on [Subversion] r6238 you say you had to perform the merge "manually". Can you describe what was the problem and what is your coding environment? (which is your Subversion client)

Basically it would mark the entire tree structure as modified and attempt to commit everything ...

plg · 2010-05-24 20:28:53

rvelices wrote:
plg wrote:
rvelices, on [Subversion] r6238 you say you had to perform the merge "manually". Can you describe what was the problem and what is your coding environment? (which is your Subversion client)
Basically it would mark the entire tree structure as modified and attempt to commit everything ...

OK, this is more or less what ddtddt also encountered. And this is what you can see when you look at merged I have performed:

* [Subversion] r6333
* [Subversion] r6334
* [Subversion] r6335

In fact, the files are not modified, only the svn properties are modified. This is a bug : SVN should not modify so many SVN properties : only the destination root directory of your merge. But unfortunately, SVN applies the SVN properties changes on sub folders How to avoid svn:mergeinfos on sub-folders?

SVN server is 1.5.1. My SVN client is 1.5.4. It seems that this bug fixed on SVN client 1.5.5, but I don't know if it also requires a SVN server 1.5.5.

rvelices · 2010-05-24 21:11:55

forgot about the client:
TortoiseSVN 1.5.2, Build 13595 - 32 Bit , 2008/07/31 17:04:57
Subversion 1.5.1,
(did not update it for quite some time now)

rvelices · 2010-05-25 09:56:13

Well, until recently, I never encountered this problem ...
By looking back at the change log of search_rules.php, it appears that the mergeinfo appeared on one of your previous commits. I don't know what's the best approach (delete the mergeinfo props from trunk and branches ?), but it is very annoying if I try to do a merge and all files appear as modified (I have no simple way to look at what has really changed and if the merge is ok).

plg · 2010-05-25 10:03:38

I will soon (today?) remove all svn:mergeinfos from all files. I hope that then, there will be no more problem.

plg · 2010-05-26 02:24:03

plg wrote:
I will soon (today?) remove all svn:mergeinfos from all files. I hope that then, there will be no more problem.

OK, I removed all svn:mergeinfo from trunk and branch 2.1

But it was not enough for my "automatic backport" script. I've found the right option:

Code:

svn merge -c6361 --ignore-ancestry ...

As you can see on [Subversion] r6365, no more mergeinfo :-)

Piwigo.org

Announcement

#1 2010-05-24 16:53:51

SVN merging between branches

Code:

#2 2010-05-24 19:58:41

Re: SVN merging between branches

plg wrote:

#3 2010-05-24 20:28:53

Re: SVN merging between branches

rvelices wrote:

plg wrote:

#4 2010-05-24 21:11:55

Re: SVN merging between branches

#5 2010-05-25 09:56:13

Re: SVN merging between branches

#6 2010-05-25 10:03:38

Re: SVN merging between branches

#7 2010-05-26 02:24:03

Re: SVN merging between branches

plg wrote:

Code:

Board footer