From: n0g0013 <tt...@co...> - 2008-02-06 16:46:59
|
On 06.02-21:03, Constantin Kaplinsky wrote: [ ... ] > > i would like to see 'orig/*' move into some meaningful branches > > or vendor trees. > > The orig/* tree should not be used for this project (porting the code to > x.org). Just ignore orig/*. understood but wouldn't it be better to move "orig/*" into correct branches / tags? i assume truck was branched from orig somewhere or was it branched from realvnc 4? > > as for the rest of the proccess it really depends on which will produce > > the fewest code deltas. lots of small commits may require more > > branching than a simple baracuda import as well as being difficult to > > decifer and will not necessarily produce a more consistent or stable > > codebase. > > I'd prefer small incremental commits to current trunk/unix/xc code (of > course it's ok to rename the directories if needed). > > The primary rule is the following: ideally, each commit should be > represented by an easily-readable diff. Anything I can't easily read and > understand is bad. :) i think we're saying "easy" but really mis-representing the word and VCS procedures. having numerous small commits does not necessarily make things easier or better. it may also make the codebase less stable as far as building and testing go. "correct" procedure (IMHO) is to branch and merge. then we can review the small commits while leaving current in coherent state. people can also easily follow a branch or wait and merge from current when branches come back to mainline. of course, it would be best to discuss branches before doing them. -- t t w |