Re: bogus merges

2005-09-06 Thread Daniel Barkalow
On Mon, 5 Sep 2005, Linus Torvalds wrote: > On Mon, 5 Sep 2005, Wayne Scott wrote: > > > > A recent commit in linux-2.6 looks like this: > > It hopefully shouldn't happen any more with the improved and fixed > git-merge-base. Couldn't it also happen if there's stale data in MERGE_HEAD when you

Re: bogus merges

2005-09-06 Thread Wayne Scott
On 9/5/05, Linus Torvalds <[EMAIL PROTECTED]> wrote: > > Really 'git commit' should detect problems like this automatically and > > prevent them from getting in the tree. > > Well, that would depend on having the fixed git-merge-base in the first > place, which in turn would mean that such a commi

Re: bogus merges

2005-09-05 Thread Linus Torvalds
On Mon, 5 Sep 2005, Wayne Scott wrote: > > A recent commit in linux-2.6 looks like this: It hopefully shouldn't happen any more with the improved and fixed git-merge-base. > Author: Russell King <[EMAIL PROTECTED]> > Date: Wed Aug 31 10:12:14 2005 +0100 I suspect rmk is using cogito-0.13, an

bogus merges

2005-09-05 Thread Wayne Scott
A recent commit in linux-2.6 looks like this: commit b129a8ccd53f74c43e4c83c8e0031a4990040830 Merge: 6b39374a27eb4be7e9d82145ae270ba02ea90dc8 194d0710e1a7fe92dcf860ddd31fded8c3103b7a Author: Russell King <[EMAIL PROTECTED]> Date: Wed Aug 31 10:12:14 2005 +0100 [SERIAL] Clean up and fix tty