Re: Priority 3 Translation spanish, was: Priority 2 Translation of web site to spanish
Daniel Tonda Castillo wrote: I get a lot of merge errors, after the git-pull: git-rev-parse web/master 745ee84ea5b583686e53dc2628e5067492997773 [EMAIL PROTECTED]: lilypond]$ git pull git://git.sv.gnu.org/lilypond.git/ web/master:web/master Trying really trivial in-index merge... es/sponsor/index.html: needs merge es/sponsor/options.html: needs merge es/switch/howto.html: needs merge fatal: you need to resolve your current index first Nope. Merging HEAD with 745ee84ea5b583686e53dc2628e5067492997773 Merging: afcbb4ac3dc6a31f371182da9c0b47cd2ca3b68f message 745ee84ea5b583686e53dc2628e5067492997773 Resolving conflicts with [EMAIL PROTECTED]:/srv/git/lilypond.git#web/master found 1 common ancestor(s): ac5da2c7e90f10ce8a680b275d1e33b10462c4ea Merge branch 'web/master' of git://git.sv.gnu.org/lilypond into web/master git-read-tree: fatal: you need to resolve your current index first No merge strategy handled the merge. git-rev-list shows one thing, and git-rev-parse another: git-rev-list HEAD | head -1 afcbb4ac3dc6a31f371182da9c0b47cd2ca3b68f git-rev-parse web/master 745ee84ea5b583686e53dc2628e5067492997773 Which would be the best way to handle this? Should I just start over? Did you have any uncommitted local changes before merging? i.e. did git status complained about Changed but not updated files? If not, that's already a good thing. Then, for each file git-pull reported a conflict about, open it in a text editor, go to the conflict zones (marked with , === and ), merge the 2 versions manually, junk any conflict mark and save the file, then run git update-index on this file. After all that, commit and the merge should be complete. However, it seems according to git-pull output that you haven't committed files in es/sponsor/; you should add them or run git-update-index on them before resolving other conflicts. Try to report the result of your experiments. It might work better than restarting from scratch. Cheers -- John Mandereau [EMAIL PROTECTED] ___ lilypond-devel mailing list lilypond-devel@gnu.org http://lists.gnu.org/mailman/listinfo/lilypond-devel
Re: Priority 3 Translation spanish, was: Priority 2 Translation of web site to spanish
The funny thins is that before I did any pull, everything worked out just fine. This might be a problem due to my using cogito in ubuntu. I'll try to compile a newer version of git and use that instead. In the meantime what are your suggestions? Daniel Tonda C. John Mandereau escribió: Daniel Tonda Castillo wrote: I get a lot of merge errors, after the git-pull: git-rev-parse web/master 745ee84ea5b583686e53dc2628e5067492997773 [EMAIL PROTECTED]: lilypond]$ git pull git://git.sv.gnu.org/lilypond.git/ web/master:web/master Trying really trivial in-index merge... es/sponsor/index.html: needs merge es/sponsor/options.html: needs merge es/switch/howto.html: needs merge fatal: you need to resolve your current index first Nope. Merging HEAD with 745ee84ea5b583686e53dc2628e5067492997773 Merging: afcbb4ac3dc6a31f371182da9c0b47cd2ca3b68f message 745ee84ea5b583686e53dc2628e5067492997773 Resolving conflicts with [EMAIL PROTECTED]:/srv/git/lilypond.git#web/master found 1 common ancestor(s): ac5da2c7e90f10ce8a680b275d1e33b10462c4ea Merge branch 'web/master' of git://git.sv.gnu.org/lilypond into web/master git-read-tree: fatal: you need to resolve your current index first No merge strategy handled the merge. git-rev-list shows one thing, and git-rev-parse another: git-rev-list HEAD | head -1 afcbb4ac3dc6a31f371182da9c0b47cd2ca3b68f git-rev-parse web/master 745ee84ea5b583686e53dc2628e5067492997773 Which would be the best way to handle this? Should I just start over? Before the pull and as the last thing, I did the commit -m with no files and got the vim edition of which files would be commited, etc. So I commented thos to be committed (in the es/ directory) and saved the file. git-status didn't show any uncommitted files after that. Did you have any uncommitted local changes before merging? i.e. did git status complained about Changed but not updated files? If not, that's already a good thing. Then, for each file git-pull reported a conflict about, open it in a text editor, go to the conflict zones (marked with , === and ), merge the 2 versions manually, junk any conflict mark and save the file, then run git update-index on this file. After all that, commit and the merge should be complete. However, it seems according to git-pull output that you haven't committed files in es/sponsor/; you should add them or run git-update-index on them before resolving other conflicts. Try to report the result of your experiments. It might work better than restarting from scratch. Here's the output of the git-pull: Ok, here goes a session of git: git pull git://git.sv.gnu.org/lilypond.git/ web/master:web/master Trying really trivial in-index merge... fatal: Untracked working tree file '.gitignore' would be overwritten by merge. Nope. Merging HEAD with 745ee84ea5b583686e53dc2628e5067492997773 Merging: afcbb4ac3dc6a31f371182da9c0b47cd2ca3b68f message 745ee84ea5b583686e53dc2628e5067492997773 Resolving conflicts with [EMAIL PROTECTED]:/srv/git/lilypond.git#web/master found 1 common ancestor(s): ac5da2c7e90f10ce8a680b275d1e33b10462c4ea Merge branch 'web/master' of git://git.sv.gnu.org/lilypond into web/master git-read-tree: fatal: Untracked working tree file '.gitignore' would be overwritten by merge. No merge strategy handled the merge. === Now git-status reports this: # # Updated but not checked in: # (will commit) # #deleted: .gitignore #deleted: GNUmakefile #deleted: README #deleted: TRANSLATION #deleted: colors.css #deleted: de/about/faq.html #deleted: de/about/index.html #deleted: de/contact.ihtml #deleted: de/index.html #deleted: de/install/cygwin.html #deleted: de/install/getting-started.html #deleted: de/install/index.html #deleted: de/install/macos.html #deleted: de/install/using.html #deleted: de/startevim.sh #deleted: de/switch/advantages.html #deleted: de/switch/howto.html #deleted: de/switch/index.html #deleted: de/switch/testimonials.html #deleted: de/switch/tour.html #deleted: es/about/automated-engraving/applications.html #deleted: es/about/automated-engraving/benchmarking.html #deleted: es/about/automated-engraving/big-page.html #deleted: es/about/automated-engraving/conclusion.html #deleted: es/about/automated-engraving/divide-and-conquer.html #deleted: es/about/automated-engraving/engraving.html #deleted: es/about/automated-engraving/formatting-architecture.html #deleted: es/about/automated-engraving/implementing-notation.html #deleted: es/about/automated-engraving/implementing-typography.html #deleted: es/about/automated-engraving/index.html #deleted: es/about/automated-engraving/input-format.html #deleted: es/about/automated-engraving/introduction.html #deleted: es/about/automated-engraving/problem-statement.html #deleted:
Re: Priority 3 Translation spanish, was: Priority 2 Translation of web site to spanish
Daniel Tonda Castillo wrote: The funny thins is that before I did any pull, everything worked out just fine. This might be a problem due to my using cogito in ubuntu I'll try to compile a newer version of git and use that instead. In the meantime what are your suggestions? If you don't need 10 hours to do it, please upgrade to latest Git and Cogito. You may also want to complain to the Ubuntu package maintainer. If you have some time and some packaging qualifications, you could even update Git and Cogito Ubuntu packages :-). It'd be absurd that the translators gave up because Git is difficult to use. So my first suggestion is to start with Cogito, which doesn't prevent you from using git commands as you become more familiar with it. Reading the revised README is not enough; you should spend time reading the docs, starting from http://git.or.cz and Gitwiki. To give you an idea, I started using Git/Cogito after having read the Crash course for CVS users. Then, you should exercise Cogito view commands (status, branch-ls, log, diff) and gitk to evaluate the state of your local Git copy of lilypond.org sources, and see whether you can go on using it, or restarting from scratch cloning git://git.sv.gnu.org/lilypond.git#web/master with Cogito. Before the pull and as the last thing, I did the commit -m with no files and got the vim edition of which files would be commited, etc. So I commented thos to be committed (in the es/ directory) and saved the file. git-status didn't show any uncommitted files after that. This looks good. Here's the output of the git-pull: Ok, here goes a session of git: git pull git://git.sv.gnu.org/lilypond.git/ web/master:web/master Trying really trivial in-index merge... fatal: Untracked working tree file '.gitignore' would be overwritten by merge. Nope. Merging HEAD with 745ee84ea5b583686e53dc2628e5067492997773 Merging: afcbb4ac3dc6a31f371182da9c0b47cd2ca3b68f message 745ee84ea5b583686e53dc2628e5067492997773 Resolving conflicts with [EMAIL PROTECTED]:/srv/git/lilypond.git#web/master found 1 common ancestor(s): ac5da2c7e90f10ce8a680b275d1e33b10462c4ea Merge branch 'web/master' of git://git.sv.gnu.org/lilypond into web/master git-read-tree: fatal: Untracked working tree file '.gitignore' would be overwritten by merge. No merge strategy handled the merge. === Now git-status reports this: # # Updated but not checked in: # (will commit) # #deleted: .gitignore #deleted: GNUmakefile #deleted: README #deleted: TRANSLATION #deleted: colors.css #deleted: de/about/faq.html [snip/ all files deleted the same way] #deleted: site/switch/menu-entries.py #deleted: site/switch/new-notation.html #deleted: site/switch/testimonials.html #deleted: site/switch/tour.html #deleted: site/template.ihtml # # # Untracked files: # (use git add to add to commit) # #.gitignore #GNUmakefile #README #TRANSLATION #colors.css #de/ #es/ #fr/ #newweb.css #nl/ #po/ #scripts/ #site/ Argh, this looks bad. Try to resolve conflicts if any, then do git add on every file, then do git commit -a, then try to pull again to check the same problem doesn't appear again. (I think I'd better give up providing Git advice :-S) Good luck -- John Mandereau [EMAIL PROTECTED] ___ lilypond-devel mailing list lilypond-devel@gnu.org http://lists.gnu.org/mailman/listinfo/lilypond-devel
Re: Priority 2 Translation of web site to spanish
Daniel Tonda wrote: I've finished the priority 3 files for the lilypond-web site: According to the mail I sent about dangling directory, the files should be: es/sponsor/index.html es/sponsor/natura.html es/sponsor/options.html es/about/automated-engraving/applications.html es/about/automated-engraving/benchmarking.html es/about/automated-engraving/conclusion.html es/about/automated-engraving/divide-and-conquer.html es/about/automated-engraving/engraving.html es/about/automated-engraving/formatting-architecture.html es/about/automated-engraving/implementing-notation.html es/about/automated-engraving/implementing-typography.html es/about/automated-engraving/index.html es/about/automated-engraving/input-format.html es/about/automated-engraving/introduction.html es/about/automated-engraving/problem-statement.html es/about/automated-engraving/schubert.html es/about/automated-engraving/scoring-esthetics.html es/about/automated-engraving/software.html es/about/automated-engraving/typography-features.html es/about/faq.html es/about/pubs.html es/documentation.html es/install/cygwin.html I didn't touch the big-file, though, as per some comments I've been reading about the possibility of removing it? The big-page file is generated by make from the sections of the essay (one .html file per section) for all languages, so you must ignore it. -- John Mandereau [EMAIL PROTECTED] ___ lilypond-devel mailing list lilypond-devel@gnu.org http://lists.gnu.org/mailman/listinfo/lilypond-devel
Re: Priority 2 Translation of web site to spanish
Ok, thanks! 2007/1/2, John Mandereau [EMAIL PROTECTED]: Daniel Tonda wrote: I've finished the priority 3 files for the lilypond-web site: According to the mail I sent about dangling directory, the files should be: es/sponsor/index.html es/sponsor/natura.html es/sponsor/options.html es/about/automated-engraving/applications.html es/about/automated-engraving/benchmarking.html es/about/automated-engraving/conclusion.html es/about/automated-engraving/divide-and-conquer.html es/about/automated-engraving/engraving.html es/about/automated-engraving/formatting-architecture.html es/about/automated-engraving/implementing-notation.html es/about/automated-engraving/implementing-typography.html es/about/automated-engraving/index.html es/about/automated-engraving/input-format.html es/about/automated-engraving/introduction.html es/about/automated-engraving/problem-statement.html es/about/automated-engraving/schubert.html es/about/automated-engraving/scoring-esthetics.html es/about/automated-engraving/software.html es/about/automated-engraving/typography-features.html es/about/faq.html es/about/pubs.html es/documentation.html es/install/cygwin.html I didn't touch the big-file, though, as per some comments I've been reading about the possibility of removing it? The big-page file is generated by make from the sections of the essay (one .html file per section) for all languages, so you must ignore it. -- John Mandereau [EMAIL PROTECTED] -- Daniel Tonda C. ___ lilypond-devel mailing list lilypond-devel@gnu.org http://lists.gnu.org/mailman/listinfo/lilypond-devel
Re: Priority 3 Translation spanish, was: Priority 2 Translation of web site to spanish
Daniel Tonda wrote: I'm sorry but I made a mistake concerning the title of the second mail: Priority 2 Translation of web site to spanish It was supposed to be for the: Priority 3 Translation of web site to spanish I attach it again just in case it went unnoticed because of the title. As I (and certainly others) choose to sort emails by thread in my e-mail client, it's better to always send translation stuff using a new (or very recent) thread, so I can process them quickly. My apologies for any inconvenience. That's OK. Thanks for your work; I've added all pages and pushed to git.sv.gnu.org. I've revised README; may you read it in detail and tell me whether everything makes sense to you please? Get it by doing git pull git://git.sv.gnu.org/lilypond.git/ web/master:web/master This command also ensures that all commands described in the revised README will work for you. There is an important issue, though: 'make LANG=es check-translation' in latest web/master from git.sv.gnu.org says a lot of fatal: bad object abb073a5a9b3a050525017ef595428c334bcfd9f I guess it's because you took the committish of a local commit (i.e. a commit you made but which is missing in git.sv.gnu.org). Please fix this by using the committish given by git-rev-parse web/master By the way, could you please follow instructions in README to update the translation? Thanks! Greetings The Translation meister -- John Mandereau [EMAIL PROTECTED] ___ lilypond-devel mailing list lilypond-devel@gnu.org http://lists.gnu.org/mailman/listinfo/lilypond-devel
Re: Priority 3 Translation spanish, was: Priority 2 Translation of web site to spanish
I get a lot of merge errors, after the git-pull: git-rev-parse web/master 745ee84ea5b583686e53dc2628e5067492997773 [EMAIL PROTECTED]: lilypond]$ git pull git://git.sv.gnu.org/lilypond.git/ web/master:web/master Trying really trivial in-index merge... es/sponsor/index.html: needs merge es/sponsor/options.html: needs merge es/switch/howto.html: needs merge fatal: you need to resolve your current index first Nope. Merging HEAD with 745ee84ea5b583686e53dc2628e5067492997773 Merging: afcbb4ac3dc6a31f371182da9c0b47cd2ca3b68f message 745ee84ea5b583686e53dc2628e5067492997773 Resolving conflicts with [EMAIL PROTECTED]:/srv/git/lilypond.git#web/master found 1 common ancestor(s): ac5da2c7e90f10ce8a680b275d1e33b10462c4ea Merge branch 'web/master' of git://git.sv.gnu.org/lilypond into web/master git-read-tree: fatal: you need to resolve your current index first No merge strategy handled the merge. git-rev-list shows one thing, and git-rev-parse another: git-rev-list HEAD | head -1 afcbb4ac3dc6a31f371182da9c0b47cd2ca3b68f git-rev-parse web/master 745ee84ea5b583686e53dc2628e5067492997773 Which would be the best way to handle this? Should I just start over? Daniel Tonda C. begin:vcard fn:Daniel Tonda Castillo n:Tonda Castillo;Daniel email;internet:[EMAIL PROTECTED] version:2.1 end:vcard ___ lilypond-devel mailing list lilypond-devel@gnu.org http://lists.gnu.org/mailman/listinfo/lilypond-devel
Priority 2 Translation of web site to spanish
I've finished the priority 3 files for the lilypond-web site: According to the mail I sent about dangling directory, the files should be: es/sponsor/index.html es/sponsor/natura.html es/sponsor/options.html es/about/automated-engraving/applications.html es/about/automated-engraving/benchmarking.html es/about/automated-engraving/conclusion.html es/about/automated-engraving/divide-and-conquer.html es/about/automated-engraving/engraving.html es/about/automated-engraving/formatting-architecture.html es/about/automated-engraving/implementing-notation.html es/about/automated-engraving/implementing-typography.html es/about/automated-engraving/index.html es/about/automated-engraving/input-format.html es/about/automated-engraving/introduction.html es/about/automated-engraving/problem-statement.html es/about/automated-engraving/schubert.html es/about/automated-engraving/scoring-esthetics.html es/about/automated-engraving/software.html es/about/automated-engraving/typography-features.html es/about/faq.html es/about/pubs.html es/documentation.html es/install/cygwin.html I didn't touch the big-file, though, as per some comments I've been reading about the possibility of removing it? - ¿The commitish id has changed for these files, this is the expected behaviour? I added them to the git as per instructions: git-rev-head HEAD | head -1, which shows a different committish than the previous, but git didn't complain, so I assume I'm doing it right. For each file: scripts/check-translation.py file git-update-index --add file Checked which files wer to be commited via git-status, and finally: git-commit -m message ¿After this commit, it is recommended to do the pull? Attached is the bzipped archive. -- Daniel Tonda C. Priority_3_translation_es-2006-12-30.tar.bz2 Description: BZip2 compressed data ___ lilypond-devel mailing list lilypond-devel@gnu.org http://lists.gnu.org/mailman/listinfo/lilypond-devel
Re: Priority 2 Translation of web site to spanish
Hi, On Sat, 30 Dec 2006, Daniel Tonda wrote: ¿The commitish id has changed for these files, this is the expected behaviour? Yes. A commit in git is sort of a tag: It contains everything which makes up a revision. So, if you say git commit, you actually construct a new state from the _whole_ tree. There is no such thing as a file version in git. (More technical: the commit _object_ contains the commit message, author and committer information, a pointer to the tree and pointer(s) to the parent commit(s). The commit id is a hash of the commit object, including the pointers. Thereby it really hashes _all_ ancestors, too.) git-rev-head HEAD | head -1, which shows a different committish than the previous, but git didn't complain, so I assume I'm doing it right. You meant git-rev-parse, right? A much easier method to verify where you are is to say $ git show HEAD This gives you the commit id, the message and the patch of the last commit. For each file: scripts/check-translation.py file git-update-index --add file Easier: $ git add file Checked which files wer to be commited via git-status, and finally: git-commit -m message If you only added files, that is okay. If you also modified files, you can do one of these: 1) Easiest: git commit -a -m 'message'. This tells git to commit all added and modified files (it will not add untracked files). If you deleted a tracked file, it will commit that, too. 2) More precise: git commit -m 'message' file1 file2. This allows you to exclude some modified files (if you want to commit them separately, for example). 3) Inconvenient: git update-index file1 file2; git commit -m 'message'. This is only for hardcore git hackers who want to live a hard life. ¿After this commit, it is recommended to do the pull? Yes. Ciao, Dscho ___ lilypond-devel mailing list lilypond-devel@gnu.org http://lists.gnu.org/mailman/listinfo/lilypond-devel
Priority 3 Translation spanish, was: Priority 2 Translation of web site to spanish
I'm sorry but I made a mistake concerning the title of the second mail: Priority 2 Translation of web site to spanish It was supposed to be for the: Priority 3 Translation of web site to spanish I attach it again just in case it went unnoticed because of the title. My apologies for any inconvenience. -- Daniel Tonda C. Priority_3_translation_es-2006-12-30.tar.bz2 Description: BZip2 compressed data ___ lilypond-devel mailing list lilypond-devel@gnu.org http://lists.gnu.org/mailman/listinfo/lilypond-devel
Re: Priority 2 Translation of web site to spanish
Hi! This is the translation of phase 2 documents from the web site. From the TRANSLATION file, there's only four files, ¿that is correct? Daniel Tonda C. Priority_2_translation_es-2006-12-29.tar.bz2 Description: application/bzip begin:vcard fn:Daniel Tonda Castillo n:Tonda Castillo;Daniel email;internet:[EMAIL PROTECTED] version:2.1 end:vcard ___ lilypond-devel mailing list lilypond-devel@gnu.org http://lists.gnu.org/mailman/listinfo/lilypond-devel
Priority 2 Translation of web site to spanish
For some reason, this mail was rejected, so I'll send it again. - This is the translation of phase 2 documents from the web site. From the TRANSLATION file, there's only four files, ¿that is correct? Daniel Tonda C. Priority_2_translation_es-2006-12-29.tar.bz2 Description: BZip2 compressed data ___ lilypond-devel mailing list lilypond-devel@gnu.org http://lists.gnu.org/mailman/listinfo/lilypond-devel
