Re: Fix interesting git-rev-list corner case

2005-07-30 Thread Junio C Hamano
Linus Torvalds <[EMAIL PROTECTED]> writes: > On Sat, 31 Jul 2005, Peter Osterlund wrote: >> >> > I bet there is a smarter way to do this, but this _should_ fix the problem >> > Peter sees. Peter? >> >> Yes, it does fix the problem. Thanks. > > Ok, Junio, can you apply the git-merge-base patch? It

Re: Fix interesting git-rev-list corner case

2005-07-30 Thread Linus Torvalds
On Sat, 31 Jul 2005, Peter Osterlund wrote: > > > I bet there is a smarter way to do this, but this _should_ fix the problem > > Peter sees. Peter? > > Yes, it does fix the problem. Thanks. Ok, Junio, can you apply the git-merge-base patch? It's not perfect, but it's clearly better than what's

Re: Fix interesting git-rev-list corner case

2005-07-30 Thread Peter Osterlund
Linus Torvalds <[EMAIL PROTECTED]> writes: > On Sat, 30 Jul 2005, Linus Torvalds wrote: > > > > Yup, it's git-merge-base, and it is confused by the same thing that > > confused git-rev-list. > > > > Thanks, I'll fix it. > > Hmm.. Here's a tentative fix. I'm not really happy with it, and maybe

Re: Fix interesting git-rev-list corner case

2005-07-30 Thread Linus Torvalds
On Sat, 30 Jul 2005, Linus Torvalds wrote: > > Yup, it's git-merge-base, and it is confused by the same thing that > confused git-rev-list. > > Thanks, I'll fix it. Hmm.. Here's a tentative fix. I'm not really happy with it, and maybe somebody else can come up with a better one. I think this

Re: Fix interesting git-rev-list corner case

2005-07-30 Thread Linus Torvalds
On Sat, 30 Jul 2005, Peter Osterlund wrote: > > > > Can you send me your HEAD and MERGE_HEAD (don't do the merge). > > HEAD : 33ac02aa4cef417871e128ab4a6565e751e5f3b2 > MERGE_HEAD: b0825488a642cadcf39709961dde61440cb0731c Bingo. Yup, it's git-merge-base, and it is confused by the same thi

Re: Fix interesting git-rev-list corner case

2005-07-30 Thread Linus Torvalds
On Sat, 30 Jul 2005, Peter Osterlund wrote: > > OK, but note that I didn't do any editing of any local files myself. > Both commit ids are from your public linux kernel git tree. What I did > was equivalent to: > > 1. rsync from > rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.gi

Re: Fix interesting git-rev-list corner case

2005-07-30 Thread Peter Osterlund
On Sat, 30 Jul 2005, Linus Torvalds wrote: > On Sat, 30 Jul 2005, Peter Osterlund wrote: > > > > OK, but note that I didn't do any editing of any local files myself. > > Both commit ids are from your public linux kernel git tree. What I did > > was equivalent to: > > > > 1. rsync from > > rsync.k

Re: Fix interesting git-rev-list corner case

2005-07-30 Thread Peter Osterlund
Linus Torvalds <[EMAIL PROTECTED]> writes: > On Sat, 30 Jul 2005, Peter Osterlund wrote: > > > > I have problems pulling linux kernel changes from > > 33ac02aa4cef417871e128ab4a6565e751e5f3b2 to > > b0825488a642cadcf39709961dde61440cb0731c into my local tree. At first > > I thought your patch wou

Re: Fix interesting git-rev-list corner case

2005-07-30 Thread Linus Torvalds
On Sat, 30 Jul 2005, Peter Osterlund wrote: > > I have problems pulling linux kernel changes from > 33ac02aa4cef417871e128ab4a6565e751e5f3b2 to > b0825488a642cadcf39709961dde61440cb0731c into my local tree. At first > I thought your patch would fix it, but it doesn't: No, this is a merge confli

Re: Fix interesting git-rev-list corner case

2005-07-30 Thread Peter Osterlund
Linus Torvalds <[EMAIL PROTECTED]> writes: > This corner-case was triggered by a kernel commit that was not in date > order, due to a misconfigured time zone that made the commit appear three > hours older than it was. I have problems pulling linux kernel changes from 33ac02aa4cef417871e128ab4a65

Re: Fix interesting git-rev-list corner case

2005-07-29 Thread Linus Torvalds
On Fri, 29 Jul 2005, Linus Torvalds wrote: > > , but any time we _depend_ on dates > one way or the other that would be a good. "_not_ be a good _thing_". I don't know what strange brain-glitch I had there. I had kind of hoped my kids would be all grown up before their dad starte

Re: Fix interesting git-rev-list corner case

2005-07-29 Thread Linus Torvalds
On Fri, 29 Jul 2005, Ryan Anderson wrote: > > Maybe it'd make sense to have the commits refuse to add a commit when it > would be younger than one of it's parents? No, the git-rev-list thing really was a bug, it was just that I hadn't thought things through when I wrote it, and the "normal" ca

Re: Fix interesting git-rev-list corner case

2005-07-29 Thread A Large Angry SCM
Ryan Anderson wrote: Maybe it'd make sense to have the commits refuse to add a commit when it would be younger than one of it's parents? Better not to trust timestamps in distributed federations since you can't guarantee any kind of accuracy across administrative boundaries. - To unsubscribe

Re: Fix interesting git-rev-list corner case

2005-07-29 Thread Ryan Anderson
On Fri, Jul 29, 2005 at 03:50:30PM -0700, Linus Torvalds wrote: > > This corner-case was triggered by a kernel commit that was not in date > order, due to a misconfigured time zone that made the commit appear three > hours older than it was. Maybe it'd make sense to have the commits refuse to add

Fix interesting git-rev-list corner case

2005-07-29 Thread Linus Torvalds
This corner-case was triggered by a kernel commit that was not in date order, due to a misconfigured time zone that made the commit appear three hours older than it was. That caused git-rev-list to traverse the commit tree in a non-obvious order, and made it parse several of the _parents_ of the