[haiku-development] Re: How to add file names to a catalog at build time?
- From: John Scipione <jscipione@xxxxxxxxx>
- To: "haiku-development@xxxxxxxxxxxxx" <haiku-development@xxxxxxxxxxxxx>
- Date: Mon, 13 May 2013 18:43:48 -0400
On Mon, May 13, 2013 at 6:20 PM, Matt Madia <mattmadia@xxxxxxxxx> wrote:
> On 5/13/13, John Scipione <jscipione@xxxxxxxxx> wrote:
>> Wow that is a lot more than I was expecting, thanks! From this patch I
>> should be able to easily extend the idea to also internationalize the
>> layout files. The only problem is that I've already done some work so
>> I'll need to apply this into master and then merge the changes back
>> into my private branch.
>
> Just to make sure, did you figure out how to use the powers of git to
> get that patch into your private branch? Because, I would be amazed if
> git is not capable of handling this situation.
I haven't tried yet... so I'll let you know.
Thinking this through, I could create a temporary branch forked from
master, apply the patch to it, then rebase my changes on top, fix up
the conflicts and then rebase back to my original branch, delete the
temp branch, then when I'm ready I can rebase my branch on top of
master again. That should get me to where I want to be while
preserving the history I want to preserve (Ingo's unmolested changes)
and discarding the history I don't (fixing up merge conflicts and the
such).
Other related posts:
