From: Rick M. <obj...@gm...> - 2010-04-24 19:11:19
|
I think I misunderstood what you were asking in my first response. Lets start again. If you are doing multiple merges, I think you can use the same starting revision number on each merge. svn is generally smart enough to figure out that a change has already been applied on a merge, so the end result is you only pick up any new changes since the last time you merged. Rick On Sat, Apr 24, 2010 at 2:52 PM, Jean-Louis Faucher <jfa...@gm...> wrote: > Hi, > > I'd like to create a sandbox to experiment changes that will not go to > official ooRexx. > I'm reading the tutorial written by Rick two years ago : > http://sourceforge.net/mailarchive/forum.php?thread_name=33bd05330711150446l30ee70b2m43978a99e5426068%40mail.gmail.com&forum_name=oorexx-devel > > Is it the right procedure to follow ? > > cd D:\local\Rexx\ooRexx\svn\sandbox > mkdir jlf > svn add jlf > svn commit jlf > svn copy https://oorexx.svn.sourceforge.net/svnroot/oorexx/main/trunk > https://oorexx.svn.sourceforge.net/svnroot/oorexx/sandbox/jlf/trunk > svn update jlf > > Then if I want to remain synchronised with trunk, I will need to merge like > that ? (assuming the copied revision was 5803) > cd D:\local\Rexx\ooRexx\svn\sandbox\jlf\trunk (is it the right directory > ?) > svn merge https://oorexx.svn.sourceforge.net/svnroot/oorexx/main/trunk@5803 > https://oorexx.svn.sourceforge.net/svnroot/oorexx/main/trunk . > > For the next merge, do I continue to use 5803, or do I replace it by the > trunk's revision number of the previous merge ? > > Jean-Louis > > > ------------------------------------------------------------------------------ > > _______________________________________________ > Oorexx-devel mailing list > Oor...@li... > https://lists.sourceforge.net/lists/listinfo/oorexx-devel > > |