The consequences don't (yet) appear to be as bad as I thought in this
scenario (play back the email thread for more info). A "merge" doesn't
happen, but the system still identified a conflict file, it just doesn't
diff/merge it very well...and I can probably deal with that, for I don't
think I have that many files that were edited in both my trunk and branch.
Example below of a trunk-branch comparison that both had their folders
renamed to the same thing and then only one (of the four) files were
changed (new-file.txt). The system doens't really merge the one changed
file very well (because it doesn't keep track of which files are the same,
it just shows the entire file as different)...but at least it identifies
which ones were changed and which ones wheren't...simply because the
merged-in files are overwritten on top of the ones in trunk and don't show
up on 'svn status' if they weren't changed. I can use a merge tool or just
manage it by hand for all the conflicted files...I hope.
Maybe this was obvious to everybody else...but it wasn't to me.
Hopefully this will go as well as I hope right now. We'll see.
-Matt
mengland@biz2tek 8:07pm [~/svnwork/zz-svn-test] 325> svn merge -r 77:79
branches/b2 trunk
Skipped missing target: 'trunk/directory4'
Skipped 'trunk/directory4-renamed'
A trunk/directory4-renamed/new-file.txt
A trunk/directory4-renamed/third-try.txt
A trunk/directory4-renamed/test-secondtry.txt
A trunk/directory4-renamed/test.txt
mengland@biz2tek 8:07pm [~/svnwork/zz-svn-test] 326>
mengland@biz2tek 8:07pm [~/svnwork/zz-svn-test] 326> svn status
? trunk/directory4-renamed/new-file.txt.working
? trunk/directory4-renamed/new-file.txt.merge-left.r0
? trunk/directory4-renamed/new-file.txt.merge-right.r79
C trunk/directory4-renamed/new-file.txt
mengland@biz2tek 8:07pm [~/svnwork/zz-svn-test] 327>
mengland@biz2tek 8:17pm [~/svnwork/zz-svn-test] 328> cat
trunk/directory4-renamed/new-file.txt
<<<<<<< .working
Matt's editing the file to create some logging/history.
=======
Matt's editing the file to create some logging/history.
another edit
>>>>>>> .merge-right.r79
mengland@biz2tek 8:18pm [~/svnwork/zz-svn-test] 329>
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sat Feb 11 03:22:56 2006