Re: [translations] snippets in LM

[Francisco Vila <paconet.org@xxxxxxxxx>]

2011/7/10 Federico Bruni <fedelogy@xxxxxxxxx>:
> Il giorno dom, 10/07/2011 alle 11.45 +0200, Francisco Vila ha scritto:
>> The problem with 0001 looks trivial but it takes time to fix it. The
>> only problem is that your patch applies to a version of the snippets
>> that has a blank line removed right after the lsrtags="" line.
>>
>> Just make another one after pulling from translation branch.  If you
>> really want to ease Carl's life, please make a patch that applies
>> cleanly on the stable/2.14 branch.
>
> I've run git pull and edited all the conflicting files, but now Git is
> messed up completely.
> What should I do?

Here are some random hints.

First of all, save your work. Make copies of your edited files to
files with different names.

If you are sure that your diff is made against a version which is in
savannah, then a patch made from these diffs should apply cleanly.
This patch also serves as a backup for you.

'git pull' alone could complain about a branch not being specified. If
you have a remotes/ file configured for lilypond/translation branch,
you should do 'git pull translation-origin' or whatever the name of
your remote is.  Here is the content of my
..git/remotes/translation-origin file:

URL: ssh://pacovila@xxxxxxxxxxxxxx/srv/git/lilypond.git
Push: lilypond/translation:refs/heads/lilypond/translation
Pull: lilypond/translation:lilypond/translation

Now, it doesn't matter what the mess you have, it can be reverted by
'git reset --hard <commit>'. If <commit> is HEAD, then you can do
simply 'git reset --hard'.  If not, copy a commit ID from 'git log'
and do 'git reset --hard <that commit>'.  Select a commit from 'git
log' that is already in savannah.

Then, copy your files back to their original names and make a new
patch. That should apply.  Better yet, 'git checkout
remotes/origin/stable/2.14', then restore your files back, then make a
commit. That one should apply to stable/2.14.

This checkout could leave your index in a no-branch status. Don't
forget to check out to lilypond/translation again after that.
-- 
Francisco Vila. Badajoz (Spain)
www.paconet.org , www.csmbadajoz.com