Re: Languages files for the gui

[Jordi Gutiérrez Hermoso]

On 27 June 2013 02:32, Catalin Codreanu <address@hidden> wrote:
> 2013/6/26 Jordi Gutiérrez Hermoso <address@hidden>

>> The idea of using hg csets is that their metadata is supposed to
>> help you apply the patch exactly at the location in which it was
>> created. You can do this with
>>
>>     hg import --exact patchname
>>
>> Once that's there, you can use hg tools to rebase the patch or
>> whatever, using a merge tool of your choice.
>>
>> Well, at least I find merge tools easier to use than manually
>> applying hunks and fixing .rejs.
>>
>> However, in this case, Catalin based the translation patch on a
>> commit that doesn't exist in Savannah.

Sorry, I misspoke here. Catalin's patch is indeed based on a patch in
Savannah.

> It doesn't say much :
>
> address@hidden octave$ hg rev -r 9968803399fa0
> abandon : no files or directories specified
> (use --all to revert all files)

Sorry, I meant "hg log -r 77c8aae15908". You based your original patch
on revision 77c8aae15908, which is this one:

    http://hg.savannah.gnu.org/hgweb/octave/rev/77c8aae15908

So, David, you could have done "hg import --exact" and the patch would
have been applied at this location. You can then rebase the patch back
to a newer revision (hg help rebase), and hg will use merge logic for
figuring out whatever trouble exists.

- Jordi G. H.