I want to file an issue because "svn merge --reintegrate" yields more
merge conflicts than "svn merge" and manually specifying the revision
numbers from "svn mergeinfo --show-revs eligible"
My understanding is that the behaviour of "svn merge --reintegrate"
should be identical to "svn merge" and manually specifying the revision
numbers from "svn mergeinfo --show-revs eligible"
Here is a screenlog which illustrates the problem:
http://cgi.sfu.ca/~jdbates/tmp/svn/200811280/screenlog
The steps it illustrates are:
* checkout a revision from my repository
* get the eligible revisions of an ancestrally related branch using "svn
mergeinfo --show-revs eligible"
* manually merge those revisions
* verify two files conflicted
* checkout the same revision
* automatically merge eligible revisions using "svn merge --reintegrate"
* observe six files conflicted!
Here is a summary of the commands from the screenlog and significant
output:
ket% ./svn --version
svn, version 1.6.0 (dev build)
compiled Nov 28 2008, 15:00:00
Copyright (C) 2000-2008 CollabNet.
Subversion is open source software, see http://subversion.tigris.org/
This product includes software developed by CollabNet (http://www.Collab.Net/).
The following repository access (RA) modules are available:
* ra_neon : Module for accessing a repository via WebDAV protocol using Neon.
- handles 'http' scheme
- handles 'https' scheme
* ra_svn : Module for accessing a repository using the svn network protocol.
- handles 'svn' scheme
* ra_local : Module for accessing a repository on local disk.
- handles 'file' scheme
ket% ./svn co http://example.com/svn/qubit/trunk/qubit/lib/vendor/symfony -r 1631
[...]
Checked out revision 1631.
ket% ./svn mergeinfo http://example.com/svn/qubit/trunk/symfony/vendor symfony --show-revs eligible
r1636
ket% ./svn merge http://example.com/svn/qubit/trunk/symfony/vendor symfony -c 1636 --accept postpone
--- Merging r1636 into 'symfony':
[...]
Summary of conflicts:
Text conflicts: 2
ket% ./svn status symfony | grep ^C
C symfony/lib/plugins/sfPropelPlugin/lib/addon/sfPropelData.class.php
C symfony/lib/yaml/sfYamlInline.class.php
ket% ./svn co http://example.com/svn/qubit/trunk/qubit/lib/vendor/symfony -r 1631 symfony-reintegrate
[...]
Checked out revision 1631.
ket% ./svn merge http://example.com/svn/qubit/trunk/symfony/vendor symfony-reintegrate --reintegrate --accept postpone
--- Merging differences between repository URLs into 'symfony-reintegrate':
[...]
Summary of conflicts:
Text conflicts: 6
Tree conflicts: 11
ket% ./svn status symfony-reintegrate | grep ^C
C symfony-reintegrate/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateAdminTask.class.php
C symfony-reintegrate/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildModelTask.class.php
C symfony-reintegrate/lib/plugins/sfPropelPlugin/test/functional/fixtures/config/ProjectConfiguration.class.php
C symfony-reintegrate/lib/plugins/sfPropelPlugin/lib/addon/sfPropelData.class.php
C symfony-reintegrate/lib/routing/sfRoute.class.php
C symfony-reintegrate/lib/yaml/sfYamlInline.class.php
ket%
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-11-29 01:10:52 CET