Hi folks,
Thanks for your help earlier. I ran into trouble again with svn merge
--reintegrate, under 1.5.5 on Ubuntu Linux. Hopefully this additional
detail will help.
Summary: svn merge --reintegrate generates a lot of conflicts, but plain
svn merge generates none.
Seeking advice. Details (edited transcript) follow. Let me know what
questions you have.
$ echo $svnroot
svn+ssh://bento/project/Grouplens/svn/cyclingproject
$ svn info
Path: .
URL: svn+ssh://bento/project/Grouplens/svn/cyclingproject/trunk
Repository Root: svn+ssh://bento/project/Grouplens/svn
Repository UUID: e6cc3703-4d0c-0410-8df7-e55f7143975b
Revision: 9738
Node Kind: directory
Schedule: normal
Last Changed Author: reid
Last Changed Rev: 9737
Last Changed Date: 2009-03-03 16:37:16 -0600 (Tue, 03 Mar 2009)
*** Branch log. Note that trunk changes were never merged in.
$ svn log --stop-on-copy $svnroot/br/masli_ib-misc_820
------------------------------------------------------------------------
r9726 | masli | 2009-03-03 15:43:14 -0600 (Tue, 03 Mar 2009) | 1 line
Fixed the node builder w.r.t. review comments. (Bug #820)
------------------------------------------------------------------------
r9725 | masli | 2009-03-03 15:10:52 -0600 (Tue, 03 Mar 2009) | 1 line
Fixed the node builder w.r.t. review comments. (Bug #820)
------------------------------------------------------------------------
r9699 | masli | 2009-03-01 18:27:46 -0600 (Sun, 01 Mar 2009) | 1 line
Fixed the lateral movement with the Vertex_Add command. :-/ (Bug #820)
------------------------------------------------------------------------
r9696 | masli | 2009-03-01 14:34:26 -0600 (Sun, 01 Mar 2009) | 1 line
Miscellaneous IB issues.
------------------------------------------------------------------------
*** Trunk log back to r9726. Several changes since the branch was
copied, but they're pretty orthogonal IIRC.
$ svn log -r9696:HEAD $svnroot/trunk
------------------------------------------------------------------------
r9723 | reid | 2009-03-03 14:49:35 -0600 (Tue, 03 Mar 2009) | 2 lines
Tweak Suggest Work button according to Joe's suggestion.
------------------------------------------------------------------------
r9724 | reid | 2009-03-03 15:01:49 -0600 (Tue, 03 Mar 2009) | 3 lines
Better message when suggest work deep link is followed and experiment is
turned off. (#805)
------------------------------------------------------------------------
r9730 | reid | 2009-03-03 15:59:10 -0600 (Tue, 03 Mar 2009) | 2 lines
Make familiarity-compute.sql re-runnable during experiment. (#740)
------------------------------------------------------------------------
r9732 | reid | 2009-03-03 16:11:50 -0600 (Tue, 03 Mar 2009) | 2 lines
Add new users or users with no familiarity to the experiment. (#740)
------------------------------------------------------------------------
r9737 | reid | 2009-03-03 16:37:16 -0600 (Tue, 03 Mar 2009) | 2 lines
Record wfs_GetWHTrial.fetch() performance. (#807)
------------------------------------------------------------------------
*** Files that changed in the branch ($svnroot edited in for readability).
$ svn diff --summarize -r9696:HEAD $svnroot/br/masli_ib-misc_820
M $svnroot/br/masli_ib-misc_820/flashclient/Conf.as
M $svnroot/br/masli_ib-misc_820/flashclient/tools/Node_Build.as
M $svnroot/br/masli_ib-misc_820/flashclient/commands/Vertex_Add.as
M $svnroot/br/masli_ib-misc_820/flashclient/commands/Node_Build.as
M $svnroot/br/masli_ib-misc_820/flashclient/G.as
*** Files that changed in the trunk since the branch was created
($svnroot edited in for readability).
$ svn diff --summarize -r9696:HEAD $svnroot/trunk
M $svnroot/trunk/pyserver/wfs_GetWHTrial.py
A $svnroot/trunk/scripts/workhints/users-update.sql
M $svnroot/trunk/scripts/workhints/familiarity-compute.sql
M $svnroot/trunk/scripts/workhints/README
M $svnroot/trunk/scripts/workhints/setup.sql
M $svnroot/trunk/flashclient/Work_Hints.as
M $svnroot/trunk/flashclient/Deep_Link.as
M $svnroot/trunk/flashclient/WFS_GetWHTrial.as
*** merge --reintegrate attempt. Note several "A" files and "missing
target"s that were not changed in either the branch or the trunk.
$svn merge --reintegrate --accept postpone $svnroot/br/masli_ib-misc_820
--- Merging differences between repository URLs into '.':
C pyserver/wfs_GetWHTrial.py
C scripts/workhints/familiarity-compute.sql
A scripts/workhints/users-partition.sql
C scripts/workhints/README
C scripts/workhints/setup.sql
A scripts/sql/042-rating-log.sql
A scripts/sql/041-ban-hammer-revert.sql
A scripts/sql/0nn-README
Skipped missing target: 'scripts/sql/043-README'
Skipped missing target: 'scripts/sql/044-ban-revert.sql'
C flashclient/Conf.as
C flashclient/tools/Node_Build.as
U flashclient/commands/Vertex_Add.as
C flashclient/commands/Node_Build.as
C flashclient/Work_Hints.as
C flashclient/Deep_Link.as
A flashclient/images/cursor_node_build.png
C flashclient/G.as
A flashclient/Intersection_Detector.as
C .
*** WD state after merge --reintegrate, "?" files trimmed. Note that
multiple files that weren't changed in the branch now have conflicts.
$ svn status
C .
C pyserver/wfs_GetWHTrial.py
C scripts/workhints/familiarity-compute.sql
C scripts/workhints/README
C scripts/workhints/setup.sql
C flashclient/Conf.as
C flashclient/tools/Node_Build.as
M flashclient/commands/Vertex_Add.as
C flashclient/commands/Node_Build.as
C flashclient/Work_Hints.as
C flashclient/Deep_Link.as
C flashclient/G.as
*** Revert that merge.
$ svn revert --recursive .
[output omitted]
*** Another merge attempt, this time without --reintegrate.
$ svn merge --accept postpone $svnroot/br/masli_ib-misc_820
--- Merging r9696 through r9738 into '.':
U flashclient/Conf.as
U flashclient/tools/Node_Build.as
U flashclient/commands/Vertex_Add.as
U flashclient/commands/Node_Build.as
U flashclient/G.as
*** WD state after plain merge (? files omitted). Totally clean.
$ svn status
M .
M flashclient/Conf.as
M flashclient/tools/Node_Build.as
M flashclient/commands/Vertex_Add.as
M flashclient/commands/Node_Build.as
M flashclient/G.as
Many thanks,
Reid
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=1268073
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-03-04 20:20:42 CET