[CCC DEV] kroc-1.5 vs. master: battle
F.R.M.Barnes at kent.ac.uk
Tue Apr 23 11:46:38 BST 2013
I sat down the other evening with the intention of pulling things from kroc's
'master' (unstable) branch into the 'kroc-1.5' (stable) branch. However,
there's a *lot* and it's not clear to me whether it's all sensible (the earliest
change looks like 2005/2008 which seems a bit old!). There are probably things
committed in kroc-1.5 that aren't in master, but the log this way isn't clear.
The way svn and Git merge branches seems to be different, so crudely pulling
in changes from one to the other is, I suspect, likely to result in a horrid mess.
As the 'master' branch is pretty stable (as far as I know), any objections if
we rename the kroc-1.5 branch (to something like kroc-1.5-stable-old) and
re-branch 'master' to 'kroc-1.5'? [once that's in place, we can cherry-pick
(or similar) changes that were made on kroc-1.5[-stable-old] that should be
kept, if there are any].
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Size: 185 bytes
Desc: not available
More information about the developers