Re: Tool renames? was Re: First stab at glossary

2005-09-03 Thread Junio C Hamano
I said: I'll draw up a strawman tonight unless somebody else does it first. 1. Say 'index' when you are tempted to say 'cache'. git-checkout-cache git-checkout-index git-convert-cache git-convert-index git-diff-cache git-diff-index

Re: [PROBLEM] Checkout from cloned repository does not work

2005-09-03 Thread Pekka Enberg
Hi Junio, On Fri, 2005-09-02 at 11:13 -0700, Junio C Hamano wrote: You would need 'chmod +x git-test.git/hooks/post-update' here if you are allowing people to pull over http from this repository. Aah, thanks! That fixed it for me. On Fri, 2005-09-02 at 11:13 -0700, Junio C Hamano wrote: The

Re: Moved files and merges

2005-09-03 Thread Junio C Hamano
This is a simplified scenario of klibc vs klibc-kbuild HPA had trouble with, to help us think of a way to solve this interesting merge problem. #1 - #3 - #5 - #7 // / #0 - #2 - #4 - #6 There are two lines of developments. #0-#2 renames F to G and introduces K.

Re: Moved files and merges

2005-09-03 Thread Sam Ravnborg
On Sat, Sep 03, 2005 at 01:25:50AM -0700, Junio C Hamano wrote: Junio C Hamano [EMAIL PROTECTED] writes: H. Peter Anvin [EMAIL PROTECTED] writes: I currently have two klibc trees, I cloned them to take a look. You_do_ seem to have a lot of renames. Well, I think I understand how

Re: Moved files and merges

2005-09-03 Thread Junio C Hamano
Fredrik Kuivinen [EMAIL PROTECTED] writes: Maybe I am missing something... but why should the merge operation ignore renames? Is there a merge case when ignoring renames is the Right Thing to do? Lets say the branches A and B has the common ancestor C which contains a file named foo. If A

Re: Moved files and merges

2005-09-03 Thread Fredrik Kuivinen
On Sat, Sep 03, 2005 at 11:46:53AM -0700, Junio C Hamano wrote: [lots of good stuff] I obviously misunderstood the complexity of this merge case. Thank you for the explanation. - Fredrik - To unsubscribe from this list: send the line unsubscribe git in the body of a message to [EMAIL PROTECTED]

Re: Moved files and merges

2005-09-03 Thread Junio C Hamano
Sam Ravnborg [EMAIL PROTECTED] writes: As explained in another mail what we want to do is actually to transpose the changes made to F to the now renamed file G. So we end up with G containing the modifications made to F. Also we want to include the new file K. Thanks for the clarification.

Re: Moved files and merges

2005-09-03 Thread Sam Ravnborg
On Sat, Sep 03, 2005 at 12:32:03PM -0700, Junio C Hamano wrote: Sam Ravnborg [EMAIL PROTECTED] writes: As explained in another mail what we want to do is actually to transpose the changes made to F to the now renamed file G. So we end up with G containing the modifications made to F.

Re: Moved files and merges

2005-09-03 Thread H. Peter Anvin
Martin Langhoff wrote: Probably should be hacked into cg-merge. When the merge reports a file is missing, what happens? Does it leave a .rej file or anything? The error message is: MERGE ERROR: nfsmount/mount.c: Not handling case 3225ecdf8d172cda2a6ea5276af0d3edc566a0e7 - -

[PATCH] Andrea Arcangeli: avoid size_buffers_type overflow

2005-09-03 Thread Linux Kernel Mailing List
tree df3013eb89fad1adfb10a1d3c843d988ca5da136 parent 403d6a334dc43cf3598d9965a01cf569e60ebe12 author Marcelo Tosatti [EMAIL PROTECTED] Sun, 04 Sep 2005 01:42:00 -0300 committer Marcelo Tosatti [EMAIL PROTECTED] Sun, 04 Sep 2005 01:42:00 -0300 [PATCH] Andrea Arcangeli: avoid size_buffers_type