On 1/26/07, Jean-Vincent Drean <[email protected]> wrote:
+1 for the second option.
2007/1/26, Ludovic Dubost <[email protected]>:
Could we get from those who know best some efficient ways to merge code from the branch to the trunk and vice-versa. Everytime I do some merges I'm not sure about what I'm doing.
+1
Merges are always painful for me :)
Merges are always painful for everyone. This is why I'm always advocating not doing them... (which is what I do on all my projects - Here we are currently not good enough in term of automated tests and quality in general to do this). Here's how to do it with the svn command line client: svn merge --revision 2021:2028 svn+ssh://[email protected]/svnroot/xwiki/xwiki/trunk XWIKI_1_0 Note: This will merge revisions 2022 to 2028 included. You must always specify a revision *before* the one you wish to merge This command was applied in trunk. If you wish to merge from 1.0 to trunk the go in 1.0 and merge to trunk. If you're using a different svn client then it all depends on your client... Hope it helps, -Vincent