On Wed, Sep 12, 2012 at 01:39:41PM -0400, John Maher wrote: > Here's what I did:
Hi John, your questions are about fundamental Subversion concepts, and that's fine. Just please understand that I don't want to type another explanation since good documentation has already been written. So, below, I'll throw you some links to the FAQ and the Subversion book for further reading, hoping that these will answer your questions. > 1. Create repository on the server called "test" with trunk and > branches directories. > 2. Issue the command G:\Code\st>svn checkout > https://server.com/svn/test/trunk . > 3. Added the project using tortoise (14 files/directories). > 4. Made a change to the project. > 5. Issue the command G:\Code\st>svn commit -m "Two" > Adding WindowsApplication1 > Adding WindowsApplication1\Form1.Designer.vb > Adding WindowsApplication1\Form1.resx > Adding WindowsApplication1\Form1.vb > Adding WindowsApplication1\My Project > Adding WindowsApplication1\My Project\Application.Designer.vb > Adding WindowsApplication1\My Project\Application.myapp > Adding WindowsApplication1\My Project\AssemblyInfo.vb > Adding WindowsApplication1\My Project\Resources.Designer.vb > Adding WindowsApplication1\My Project\Resources.resx > Adding WindowsApplication1\My Project\Settings.Designer.vb > Adding WindowsApplication1\My Project\Settings.settings > Adding WindowsApplication1\WindowsApplication1.sln > Adding WindowsApplication1\WindowsApplication1.vbproj > Transmitting file data ............ > Committed revision 2. > 6. Made a change to the project. > 7. Issue the command G:\Code\st>svn commit -m "Three" > Sending WindowsApplication1\Form1.Designer.vb > Transmitting file data . > Committed revision 3. > 8. Made a change to the project to simulate a feature. > 9. Issue the command G:\Code\st>svn commit -m "Four" > Sending WindowsApplication1\Form1.Designer.vb > Transmitting file data . > Committed revision 4. > 10. Issue the command G:\Code\st>svn copy > https://server.com/svn/test/trunk > https://server.com/svn/test/branches/feature -m "Feature" > Committed revision 5. > 11. Changed the current directory from st (subversion test) to stb > (subversion test branch. > 12. Issue the command G:\Code\stb>svn checkout > https://server.com/svn/test/branches/feature . > A WindowsApplication1 > A WindowsApplication1\WindowsApplication1.vbproj > A WindowsApplication1\Form1.resx > A WindowsApplication1\Form1.Designer.vb > A WindowsApplication1\Form1.vb > A WindowsApplication1\WindowsApplication1.sln > A WindowsApplication1\My Project > A WindowsApplication1\My Project\Resources.Designer.vb > A WindowsApplication1\My Project\Settings.settings > A WindowsApplication1\My Project\AssemblyInfo.vb > A WindowsApplication1\My Project\Settings.Designer.vb > A WindowsApplication1\My Project\Application.Designer.vb > A WindowsApplication1\My Project\Application.myapp > A WindowsApplication1\My Project\Resources.resx > Checked out revision 5. > 13. Made a change to the feature branch. > 14. Issue the command G:\Code\stb>svn commit -m "Six-feature" > Sending WindowsApplication1\Form1.Designer.vb > Transmitting file data . > Committed revision 6. > 15. Changed the current directory from stb to st. > 16. Made a change to the project to simulate a bug fix. > 17. Issue the command G:\Code\st>svn commit -m "Five-bug fix" > Sending WindowsApplication1\Form1.Designer.vb > Transmitting file data . > Committed revision 7. > *** Why 7? See http://svnbook.red-bean.com/en/1.7/svn.basic.in-action.html#svn.basic.in-action.revs and http://subversion.apache.org/faq.html#globalrev Note that the "tree" being talked about there is not an individual branch, but all nodes in the repository, including the /trunk directory and the /branches/feature directory. > 18. Changed the current directory from st to stb to try to merge the > bug fix to the feature branch. > 19. Issue the command G:\Code\stb>svn merge > https://server.com/svn/test/trunk --dry-run > svn: E195020: Cannot merge into mixed-revision working copy [5:6]; try > updating first > *** Why update? No one else is doing anything!! Please see http://svnbook.red-bean.com/en/1.7/svn.basic.in-action.html#svn.basic.in-action.mixedrevs and http://subversion.apache.org/faq.html#hidden-log > 20. Issue the command G:\Code\stb>svn update > Updating '.': > At revision 7. > *** Why go to 7? See above. > 21. Issue the command G:\Code\stb>svn diff -r6:7 > (Nothing returned using -r5:7 displays the changes I made) > 22. Issue the command G:\Code\stb>svn merge > https://server.com/svn/test/trunk --dry-run > --- Merging r5 through r7 into '.': > C WindowsApplication1\Form1.Designer.vb > Summary of conflicts: > Text conflicts: 1 > What does that mean? See http://svnbook.red-bean.com/en/1.7/svn.tour.cycle.html#svn.tour.cycle.resolve
