Johannes Schindelin wrote:
Hi,
On Tue, 5 Dec 2006, Graham Percival wrote:
# Updated but not checked in:
# (will commit)
#
# modified: .gitignore
# modified: Documentation/topdocs/NEWS.tely
...
This means that you do have modifications in those files. Could you please
try a
$ git -p diff HEAD
to see what are the modifications? If they are trivial, you might want to
undo them.
I get a 54k diff file (when redirected to a file) that has a huge number
of valid-looking patches. I mean, it's not some kind of weird binary
vs. ascii file transfer thing, nor missing files.
It might be all the patches that occurred after I checked out my copy.
But it could be that they are not trivial. In this case, you have either
- modified the files yourself (by editing, or applying a patch), or
- git did something really weird.
I certainly haven't edited these myself. I wish I _could_ fix bugs in
scheme code like this. :)
Now the question is "did git do something really weird?", or "did I make
git do something really weird?" I really did flail around blindly
while trying to fix the merge problem. I'm not convinced it's worth
trying to figure out what git did (or what I did to git).
I made sure that I extracted my patches; Han-Wen applied them. If you
want to keep investigating this, I'm happy to type in commands and send
you the results. But I'm starting to think that I should just reset git
and try using it sensibly for a while -- particularly since I can't
remember everything I did to git in order to get to this state.
It could be a lot of things. If you are on a permission-challenged
filesystem (such as FAT, which cannot tell fish^H^H^H^Hexecutable files
:)
I'm on HFS+.
from non-executables), there is a problem. Git views permission changes as
trackable changes, too.
I can't see any changes like that here. It just looks like a normal
week of email from the old lilypond-cvs list. :)
Now, I promised to tell you what to do if all the files seem modified. Did
you look through "git -p diff"? (BTW with recent Git you only need "git
diff" and it will pipe the result into your pager automatically.)
So, you still want to undo the modifications, either because they are not
important, or you don't know where they came from and they don't make
sense, or they are permission changes you did not want in the first place?
I'm waiting for you to tell me. :) They're not mine, they're good
patches, and I'm sure they exist in the main branch. Here's an example:
diff --git a/VERSION b/VERSION
index 36a6a28..f78e473 100644
--- a/VERSION
+++ b/VERSION
@@ -1,6 +1,6 @@
PACKAGE_NAME=LilyPond
MAJOR_VERSION=2
MINOR_VERSION=11
-PATCH_LEVEL=0
+PATCH_LEVEL=1
MY_PATCH_LEVEL=
I'm certain that patch happened after I checked the files out -- and I'm
certain it was made by Han-Wen, not me.
So, do we do more debugging, or do I
$ git reset --hard
? :)
Cheers,
- Graham
_______________________________________________
lilypond-devel mailing list
lilypond-devel@gnu.org
http://lists.gnu.org/mailman/listinfo/lilypond-devel
