On Sun, Apr 25, 2010 at 5:24 AM, buginator <[email protected]> wrote: > Since the sync bot is MIA again, (and it looks like it was skipping > patches as well) would it be ok to start doing mass syncs to those > branches, or will that hose up the history when we merge things back > to trunk ? > > Is there a better way to handle syncs ?
For at least newnet and Qt, the sane way of handling syncs is to check out from gitorious, and do a git merge, and commit/push the merge. (Anything else is likely to mess up history, at best.) I don't know how lua2 was handled, so can't comment on that. The merge can then optionally also be committed to svn, if anyone still uses that. _______________________________________________ Warzone-dev mailing list [email protected] https://mail.gna.org/listinfo/warzone-dev
