{"thread":{"id":"2832","subject":"RE: new file leaked onto release branch","startedAt":"2005-12-14T09:58:51Z","lastAt":"2005-12-14T09:58:51Z","messageCount":1,"participants":["Brown, Len"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"13615","messageId":"F7DC2337C7631D4386A2DF6E8FB22B300567ED88@hdsmsx401.amr.corp.intel.com","threadId":"2832","inReplyTo":null,"subject":"RE: new file leaked onto release branch","fromName":"Brown, Len","fromEmail":"len.brown@intel.com","sentAt":"2005-12-14T09:58:51Z","receivedAt":"2005-12-14T09:58:51Z","isPatch":false,"sender":{"key":"len.brown@intel.com","avatar":"https://gravatar.com/avatar/a091f34f66caadb51d85a8a496800c6ccae73737e2f45762373e6b8c55fa5dd6?d=mp&s=160"},"body":">What do you use to create these \"Auto-update\" commits, and how\n>can I help you to fix it?\n\nI use the attached script, which I pasted from\ngit/Documentation/howto/using-topic-branches.txt\n\ngit.update linus\n\nto get the latest stuff from Linus onto the linus branch\n\ngit.update release\n\nto pull linus branch into my release branch\n\ngit.update release\n\nto pull linus branch into my test branch\n\nI also use the git.merge script to pull topic branches\ninto either release or test, or to pull release into test.\nI used git.merge to pull release into acpica because\nacpica had fallen behind the base at one point, and this\nmay be where the issue happened.\n\nin the case of the acpica topic branch, it was not pulled\nback into either release or into test after the file in question\nwas added.  Indeed, you can pull the acpica branch from the tree\non kernel.org.\n\nI'm trying to remember if there were git error message along the way.\nI do remember an issue with a commit where I had re-named a file\nand git didn't recognize it as such.  so I put this in my git.commit\nwrapper:\n\ngit-udpate-index --add --remove `quilt files`\ngit commit\n\ndunno if that may be related to the issue at hand.\nI don't really understand this index stuff...\n\nthanks,\n-Len\n"}]}