On Thursday 02 November 2006 17:02, Doug Reiland wrote: ... > I want to use internal_testing as a branch to merge and test the > latest Linux branch with changes made to internal_current. Once this > testing is complete, merge the changes into internal_current. > > That is the best way to do this. I am open to use cogito. I have > messed up this merging process just about each time, and I want to get > a stable process before I open this up to other users. I notice that nobody has responded to your questions and a couple of days have gone past, and whilst I am not sure I know enough to respond correctly, I will do so to keep the thread alive so that perhaps someone more knowledgeable than me can comment too. It sounds as though you are setting up a central repository type concept. So why try and do the work of merging Linus' repository there? Why not clone from Linus in a local repository, merge in changes from this common repository into your local repository and test, and when happy push them back out to the common one? > > Also, I can't figure out permissions. I have setup the allow_users > hook in .git/hooks/update. My repository is "owned" by gate_keeper. My > user login is dreiland. I push changes back to the gate_keeper > repository and stuff under .git gets owned by me. Now, I log as a > gate_keeper to get a Linus update or perform the internal_testing > merges and things fail because it is owned by dreiland. Did you do a git-init-db --shared ? does gate_keeper and yourself belong to the same group? -- Alan Chandler http://www.chandlerfamily.org.uk - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html