On Tue, Sep 21, 2010 at 10:35:16PM +0200, Jens Rehsack wrote: > 2010/9/21 Tim Bunce <tim.bu...@pobox.com>:
> >> Tim suggest that Pure-Perl DBD development can happen in branches and > >> they should be merged into the trunk when they are ready. Well, I had > >> merged the state of r14409, because I rated it ready, but I hadn't merge a > >> day before a final release. > > > > I'm not sure what you're saying here, but let's not worry about the past. > > I try to say: even if I had branched, I would have merged, too. I meant to > say: > I strongly need a responsible person who would take that merge tasks (and > probably hears when I cry out: "This must be included into the release"). That'll be me :) I should be the one to take responsibility for what gets merged into trunk. > >> On the other hand, are the git users able to use the svn branches? > > > > I don't know how updates work with git svn, but a fresh git svn clone > > will work (though it would wipe out any local changes). > > Yes, but switching will be difficult... sorry guys. > > >> Is it a suitable way to step further? > > > > I thought you were a keen svn user and not at all keen to use git. > > (Though on reflection I suspect your previous problems with git were due > > to working on the trunk rather than always working on personal/feature > > branches. With git you "branch early, branch often" and generally avoid > > committing individual to the trunk.) > > No, my problems are, that git find conflicts during merge tries where it > should fast forward. I need Merijn for some hours to dig deeper, currently I > can > only guess ... > Branching wouldn't help me out, except I always throw away the old branch > and start a new one after Merijn pushed the commit of my changes. But > doesn't lead those way of working an scm ad absurdum? Clearly something odd is happening because thousands of other people use git without these kinds of problems. Find and fix the underlying cause and I think you'll find git very good. > > I don't mind how the SqlEngine team chooses to organize it's own branches. > > But I'd like to only have to work with one primary branch, eg sqlengine, > > for integration into the trunk. > > I think, when we (I) tell you the branch to merge, it should be ok, > shouldn't it? I'm saying I only want to merge from the sqlengine branch (and only when you guys tell me it's ready). Tim.
