{"thread":{"id":"43612","subject":"Re: git and branches newie questions","startedAt":"2006-11-02T17:02:42Z","lastAt":"2006-11-04T07:46:23Z","messageCount":2,"participants":["Alan Chandler","Doug Reiland"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"297384","messageId":"6844644e0611020902tc6251f7i2eda0d3fc82e0502@mail.gmail.com","threadId":"43612","inReplyTo":null,"subject":"git and branches newie questions","fromName":"Doug Reiland","fromEmail":"dreiland@gmail.com","sentAt":"2006-11-02T17:02:42Z","receivedAt":"2006-11-02T17:02:42Z","isPatch":false,"sender":{"key":"dreiland@gmail.com","avatar":null},"body":"I need some suggestions for the best way to setup my repositories.\n\nI have a linux repository cloned right from Linus.\nI want to create 2 additional branches in this repository:\n   internal_current and internal_testing\n\nI want to use internal_current to make modifications to the main Linux\nbranch for an internal project.\n\nI want other users to clone/pull/push changes to the internal_current branch.\n\nI want to use internal_testing as a branch to merge and test the\nlatest Linux branch with changes made to internal_current. Once this\ntesting is complete, merge the changes into internal_current.\n\nThat is the best way to do this. I am open to use cogito. I have\nmessed up this merging process just about each time, and I want to get\na stable process before I open this up to other users.\n\nAlso, I can't figure out permissions. I have setup the allow_users\nhook in .git/hooks/update. My repository is \"owned\" by gate_keeper. My\nuser login is dreiland. I push changes back to the gate_keeper\nrepository and stuff under .git gets owned by me. Now, I log as a\ngate_keeper to get a Linus update or perform the internal_testing\nmerges and things fail because it is owned by dreiland.\n\n"},{"id":"295969","messageId":"200611040746.23619.alan@chandlerfamily.org.uk","threadId":"43612","inReplyTo":"6844644e0611020902tc6251f7i2eda0d3fc82e0502@mail.gmail.com","subject":"Re: git and branches newie questions","fromName":"Alan Chandler","fromEmail":"alan@chandlerfamily.org.uk","sentAt":"2006-11-04T07:46:23Z","receivedAt":"2006-11-04T07:46:23Z","isPatch":false,"sender":{"key":"alan@chandlerfamily.org.uk","avatar":"https://gravatar.com/avatar/1862247e5ea8eac114c842f9dc3a5db6253754e24ef7171757cf97eedce48b8c?d=mp&s=160"},"body":"On Thursday 02 November 2006 17:02, Doug Reiland wrote:\n...\n> I want to use internal_testing as a branch to merge and test the\n> latest Linux branch with changes made to internal_current. Once this\n> testing is complete, merge the changes into internal_current.\n>\n> That is the best way to do this. I am open to use cogito. I have\n> messed up this merging process just about each time, and I want to get\n> a stable process before I open this up to other users.\n\nI notice that nobody has responded to your questions and a couple of days have \ngone past, and whilst I am not sure I know enough to respond correctly, I \nwill do so to keep the thread alive so that perhaps someone more \nknowledgeable than me can comment too.\n\nIt sounds as though you are setting up a central repository type concept.  So \nwhy try and do the work of merging Linus' repository there?  Why not clone \nfrom Linus in a local repository, merge in changes from this common \nrepository into your local repository and test, and when happy push them back \nout to the common one?\n\n\n>\n> Also, I can't figure out permissions. I have setup the allow_users\n> hook in .git/hooks/update. My repository is \"owned\" by gate_keeper. My\n> user login is dreiland. I push changes back to the gate_keeper\n> repository and stuff under .git gets owned by me. Now, I log as a\n> gate_keeper to get a Linus update or perform the internal_testing\n> merges and things fail because it is owned by dreiland.\n\nDid you do a git-init-db --shared ?\n\ndoes gate_keeper and yourself belong to the same group?\n\n\n-- \nAlan Chandler\n"}]}