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
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
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.
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
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]
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.
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 - -
7 matches
Mail list logo
