look at this, then read the man pages or the svn-book : $ cd ~/amsn-trunk/ $ svn commit -m "fixed bug blabla..." commited revision 6700 $ cd ~/amsn-branch096/ $ svn merge -r 6699:6700 https://svn.sourceforge.net/svnroot/amsn/trunk/amsn $ svn status $ svn diff $ svn commit -m "ported fix of r6700 to 0.96"
in other words, you commit in the trunk, then you go to the branch, do a svn merge, specifying the path to the trunk and which revision to merge, this will be equivalent to doing a svn diff before the commit (or using the diff from the amsn-commits) and use `patch -p0 < diff-file` in the branch, BUT it's also better, it will also add/remove/move/copy any files to which you did a 'svn move' or ... don't forget to do an svn status and an svn diff EVERYTIME before, this way, you'll always be sure not to break the 0.96 branch by commiting unwanted stuff... or adding/removing unwanted files.. if you realized that you used the wrong revision number, or that the commit of that revision contained too many changes that you didn't want to have in the commit, then simply do a $ svn revert to get back what you had before, but beware, this will also revert any changes you had BEFORE diong the svn merge.. best solution is to commit any work on the branch before doing the svn merge, in case you realize the merge was a bad idea and want to revert without loosing the changes you had originally made to the files. p.s.: when you get a conflict while updating, there will be 3 temp files added to the dir to help you fix the conflict, once you fixed the conflict, to be able to commit again, you must first do a 'svn resolved $filename' -- KaKaRoTo _______________________________________________ Amsn-devel mailing list Amsn-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/amsn-devel
