Hello, On Wed, Jun 26, 2013 at 5:55 AM, <r...@uarservices.com> wrote: > I'm truckin along in my project and I had a "Hold my beer, I'm gonna try > somthin'" moment and it did not work and the edits are all through the code. > Generally I would Update to Revision and choose Rev 513 (the one before the > event) and I go on my merry way, edit then commit which will generally just > create the next highest build number with the newly edited working copy.
I'm a bit confused by the workflow you've described above, so it could be that I don't completely understand the description. This workflow you describe works only if you have not committed your changes or no one else modified the file in the repository. As far as I understand your case, when you will update to rev 513, modify a file and attempt to commit your changes, you will get a prompt that the working copy is outdated because the file was modified in rev 522. Then you update the working copy and get conflicts in the file you've modified. You can always resolve the conflict by choosing to "Resolve conflict using mine" option in context menu, discarding changes from rev 522. > For some reason this SVN rookie does not understand, if I now Update to > Revision 513, edit, then commit, the blasted thing is merging the bad code, > Rev 522 with mine and putting all the <<<<<< mine <<<<<< rev522 crap in my > code along with the code that doesn't work. Do you get this after choosing to "Resolve conflict using mine" in context menu for the conflicted file? > I want to make a clean break and hop over rev 522 and have a 523 revision > Without the merging. I would be happy to delete all revisions from 514 to > 522 if I can to pull this off but I don't have much confidence going > forward. For a year now VisualSVN and I have been the best of friends but > now I don't like it so much. :-) Why do you want to avoid merging in this case? It's common to use merge to undo changes. Please see the following articles: "SVNBook | Undoing Changes": http://www.visualsvn.com/support/svnbook/branchmerge/basicmerging/#svn.branchmerge.basicmerging.undo "Viewing the Project History": http://www.tortoisesvn.net/docs/release/TortoiseSVN_en/tsvn-qs-guide.html#tsvn-qs-log Hope it helps. -- With best regards, Pavel Lyalyakin VisualSVN Team -- You received this message because you are subscribed to the Google Groups "VisualSVN" group. To unsubscribe from this group and stop receiving emails from it, send an email to visualsvn+unsubscr...@googlegroups.com. To post to this group, send email to visualsvn@googlegroups.com. Visit this group at http://groups.google.com/group/visualsvn. For more options, visit https://groups.google.com/groups/opt_out.
