Re: How to procede with \override/\revert business

[David Kastrup]

Francisco Vila <address@hidden> writes:

> 2012/10/28 David Kastrup <address@hidden>:
>> The translations for 2.16.1 are pretty much through, and I merged into
>> master again.
>
> I updated Documentation/es/changes.tely for stable and committed to
> translation branch. Then updated the same file for 2.17 (I wrongly
> said it was for 2.16 in the commit info) and committed to staging
> branch. This is a source of conflict, but the merge shows no conflict.
> Why?

Because in the course of back- and forward synching, it would appear
that I already merged this change into staging before you did:

|  
* commit 6950b3e065410d54e1c55fa5c5c296318842709c
| Author: David Kastrup <address@hidden>
| Date:   Tue Oct 2 16:43:11 2012 +0200
| 
|     Assignments can't contain literal lyric music (wrong lexer mode)
|     
|     Since assignments can't happen in lyrics mode (only in INITIAL mode or
|     the initial music mode), there is no point in supporting
|     non-mode-switching items on the right side of assignments that can
|     only occur in lyrics mode.
|    
*   commit f0fe9c843e926066299c1f9a33004649f42e1f24
|\  Merge: 6b45c18 11a15ac
| | Author: David Kastrup <address@hidden>
| | Date:   Thu Oct 25 19:14:27 2012 +0200
| | 
| |     Merge remote-tracking branch 'origin/translation' into master
| |   
| * commit 11a15ac466c4ce759b8256769ad94f0604517eec (origin/translation)
| | Author: Jean-Charles Malahieude <address@hidden>
| | Date:   Wed Oct 24 19:13:59 2012 +0200
| | 
| |     Doc-fr: update for 2.16.1 (first part)
| |   
| * commit c78a460d9f2953649fd9887c09ee73226f85280d
| | Author: Francisco Vila <address@hidden>
| | Date:   Mon Oct 22 22:12:11 2012 +0200
| | 
| |     Doc-es: update Changes.
| |   

Hopefully, I would have resolved any conflicts correctly when doing
that.

-- 
David Kastrup