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

SVN 1.5 merge --reintegrate gives conflict in svn:mergeinfo property and phantom updates

From: Marc Strapetz <marc.strapetz_at_syntevo.com>
Date: Tue, 06 May 2008 15:32:42 +0200

I want to --reintegrate merge from /base/trunk/q into a 'feature' branch
/base/branches/rad/q. "q" is actually a subdirectory of the "base"
project but the root of the local working copy onto which all of the
following commands are performed.

Last trunk change occurred at r246. At r247 the rad branch has been
successfully --reintegrate merged, giving an svn:mergeinfo for "q" of:

  svn:mergeinfo : /base/trunk/q:177-246

In r248, the svn:mergeinfo was updated once again (by another
--reintegrate merge with RC4, giving similar problems) to:

  svn:mergeinfo : /base/trunk/q:177-248

Now, with RC5 I'm trying to

  svn merge --reintegrate svn://localhost/base/trunk/q

which gives a conflict in the svn:mergeinfo property itself:

  Conflict for property 'svn:mergeinfo' discovered on ''.
  They want to delete the property, you want to change the
  value to '/base/trunk/q:177-247'.
  Select: (p) postpone, (mf) mine-full, (tf) theirs-full,
         (h) help for more options: tf
  U .

Finally, after selecting "tf" here the property gets updated to

  svn:mergeinfo : /base/trunk/q:177-262

Does this conflict make sense?

Furthermore, before reporting the conflict the merge command reports
several modifications of directory properties:

  G sequence
  G testutil
  G dependency

These changes had already been merged in r247 and actually none of the
directories get locally modified by this merge.

Another problem: The "rad" branch is actually much older but has been
recreated after switching the server to 1.5 RC4. Before that I had tried
to make the branch equal to the trunk by simple merges and settings the
svn:mergeinfo with --record-only to the latest trunk revision. After
some more trunk changes, the --reintegrate merge gave many conflicts. I
had expected SVN to make my "rad" branch equal to the trunk, but this
didn't happen at all. Maybe I'm misunderstanding the --reintegrate
option, but should it ever give any conflicts?

Furthermore, this merge also modified some of the
svn:wc:ra_dav:version-url to /base/trunk/... (!) AFAIK,
svn:wc:ra_dav:version-url is used for driving the commit sequence, so
committing the merge changes would probably have gone to the trunk,
instead of the branch ...

Best regards,
Marc Strapetz
SyntEvo GmbH
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-05-06 15:33:09 CEST

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.