Some more information, that may indicate a bug:
All and only the 5 files concerned with the probleme have been commited
during after a merge from the trunk, empty of modification, but with the raw
properties modified as follow:
added line
/branches/project-1.13/*pathToFile*:6266-6372
This comes from a merge done on the trunk from a release branch, which in
turn made its way to the Feature branch of the trunk.
The operation seem regular to me, the question is why only those 5 files
have add the mergeinfo added?
What can I do to solve this? Would simply remove the added line in mergeinfo
for those 5 files would do trick?
thanks
Jean
---------- Forwarded message ----------
From: Jean Seurin <jean.eastc...@gmail.com>
Date: Thu, May 6, 2010 at 6:18 PM
Subject: Cannot reintegrate feature branch
To: users@subversion.apache.org
Hi,
I just persuaded my organisation to give a try to Feature Branch.
After 3 merges only, when I attempt to --dry-run a merge --reintegrate I've
got the following error:
svn merge --reintegrate ^/branches/project-dev --dry-run
With an OSX 1.6.11 client :
svn: Cannot reintegrate into a working copy not entirely at infinite depth
with a Ubuntu 1.6.5 client on fresh check out:
svn: Reintegrate can only be used if revisions 6336 through 6393 were
previously merged from svn://company/company/trunk/project to the
reintegrate source, but this is not the case:
branches/project-dev/src/test/java/com/company/client/project/adherent/persistence/AdherentDaoHibernateTest.java
Missing ranges:
/trunk/project/src/test/java/com/company/client/project/adherent/persistence/AdherentDaoHibernateTest.java:6336-6389
branches/project-dev/src/test/java/com/company/client/project/codeobjet/persistence/CodeObjetDaoHibernateTest.java
Missing ranges:
/trunk/project/src/test/java/com/company/client/project/codeobjet/persistence/CodeObjetDaoHibernateTest.java:6336-6389
branches/project-dev/src/test/java/com/company/client/project/courrier/persistence/CourrierDaoHibernateTest.java
Missing ranges:
/trunk/project/src/test/java/com/company/client/project/courrier/persistence/CourrierDaoHibernateTest.java:6336-6389
branches/project-dev/src/test/java/com/company/client/project/dossierstagiaire/persistence/DossierStagiaireDaoHibernateTest.java
Missing ranges:
/trunk/project/src/test/java/com/company/client/project/dossierstagiaire/persistence/DossierStagiaireDaoHibernateTest.java:6336-6389
branches/project-dev/src/test/resources/log4j.properties
Missing ranges:
/trunk/project/src/test/resources/log4j.properties:6336-6389
I really don't undertsand what has happened. The merge went well.
I've tried to modify the svn:mergeinfo properties to add the missing info
but to now avail. I think I shouldn't have to that.
Help please!
Jean
