Thanks, Ryan. Your understanding is correct, the file was simply replaced (that's a project problem, not svn's) and trying to merge rev 8 didn't do anything (as you suggested)
I feel much better now as I did merge the diff into the current file and committed that, exactly as you suggested. I'm glad I wasn't missing something "magic" in svn that I might have missed. Bill W On Sun, Jan 23, 2011 at 7:55 PM, Ryan Schmidt < subversion-20...@ryandesign.com> wrote: > > On Jan 23, 2011, at 17:32, Bill Waggoner wrote: > > > This is a confused newbie question about merge. I'll try to be brief ... > > > > I have a script, index.php, that I updated at R8 to add some code. We > are now at R13 or so ... Someone else, outside of SVN, updated the source > file with changes that did not include my changes at R8. Now I have a copy > of their updated file, how (or can I?) use MERGE to take my changes (7:8) > and insert them into the new source? The changes are not in conflict at > all. > > It sounds like they did not use "svn merge" to cause this problem; they > just copied a bad file into the directory and committed it. So I wouldn't > use "svn merge" to try to fix it. (Using "svn merge" to try to merge > revision 8 would try to also record the fact that it is merging revision 8, > which would cause it some difficulty since, as far as it knows, revision 8 > is already there). I would just use "svn diff -c8" to get the changes for > revision 8 and apply that diff to the file, then commit it. > >
