Adam R. B. Jack wrote:
BTW: I think we ought have a 'live' parrallel to 'trunk', run brutus off 'live' and SVN move trunk to live only when stable (and tested in test on Brutus). That seem a good plan?

Hmm, I think I need some SVN help. I creates the /live next to /trunk (not
under /tags nor /branches on purpose) ... but now I don't know how to update it
from /trunk when that is stable. I tried copy, but it complains about files alre
ady existing. I think I might need merge, but not sure how. Any takers?

see:

  http://svnbook.red-bean.com/svnbook/ch04s03.html

I think its something like:

  cd ../trunk
  svn up
  svn info # jot down or remember "Revision: 36225"
  cd gump/live
  svn info # jot down or remember "Last Changed Rev: 36070"
  svn merge -r 36070:36225 https://svn.apache.org/repos/asf/gump/trunk
  svn commit -m "Update to trunk rev 36225"

this says "take the changes from revision 36070 through 36225 that have been applied to the trunk and merge them into my local copy of the info branch". If you make changes to the live branch independently of the trunk the situation becomes a little more complicated...


- LSD

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



Reply via email to