From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Warren Date: Thu, 11 Oct 2012 11:22:31 -0600 Subject: [U-Boot] U-Boot git usage model In-Reply-To: <1349975777.6903.6@snotra> References: <1349975777.6903.6@snotra> Message-ID: <50770057.2000507@wwwdotorg.org> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de On 10/11/2012 11:16 AM, Scott Wood wrote: > On 10/11/2012 11:38:00 AM, Tom Rini wrote: >> On Tue, Oct 09, 2012 at 02:32:08PM -0700, Tom Rini wrote: ... >> In the case of post-v2012.10, it will be rebased as we want the commit >> to change how >> ARM and unaligned accesses are handled to be the first thing. > > Any particular reason, short of telling people whose patches have > already been accepted that they need to respin them? (I'm really replying to Tom here not Scott) As I understand it, the process for getting u-boot/next into u-boot/master is perhaps: 1) tag u-boot/master for the release 2) merge u-boot/next into u-boot/master (or perhaps you're proposing rebase u-boot/next onto u-boot/master and then fast-forward merge it). I think the solution to getting patches into u-boot/master first is therefore: 1) tag u-boot/master for the release 2) apply, cherry-pick, or merge a branch with just the early commits into u-boot/master 3) merge u-boot/next into u-boot/master (hopefully (3) doesn't contain duplicated commits with (2)... the beauty of the Linux kernel's model is that it wouldn't, and even with U-Boot's model it wouldn't with sufficient planning) That way, everything can still be merges, and hence preserve commit IDs, but we also get any early commits in early.