[Scummvm-devel] modifying dreamweb asm?
Vladimir Menshakov
whoozle at yandex.ru
Fri Jun 17 19:06:43 CEST 2011
Or maybe just add dreamweb.original.sources.zip into devtools. Translating original sources simply wont work.
17.06.2011, 17:01, "Willem Jan Palenstijn" <wjp at usecode.org>:
> On Fri, Jun 17, 2011 at 02:36:51PM +0200, Max Horn wrote:
>
>> Am 17.06.2011 um 11:23 schrieb Eugene Sandulenko:
>>> On 17 June 2011 12:02, Paul Gilbert <paulfgilbert at gmail.com>; wrote:
>>>> Could it be possible to modify the Git history to insert the unaltered
>>>> versions at the beginning of /devtools/tasmrecover/dreamweb?
>>> Modifying history on a public repository is not the best idea.
>>>
>>> What I can do is to commit now the original version, mark it as such
>>> and then commit over the current state.
>> Hm, I wonder if we could use grafting to solve this in a nicer way. Maybe
>> somebody who actually knows about grafting (Willem?) can clarify...
>>
>> [a minute passes] Hm, so what I could learn from a quick googling is that
>> grafting might not help, because it is local to one system (right?), but
>> maybe "git replace" can help, see
>> <https://git.wiki.kernel.org/index.php/GraftPoint> and
>> <http://progit.org/2010/03/17/replace.html> and of course the git man pages.
>>
>> Then again, this might be overkill (if it works at all)
>
> I don't really think doing "tricky" things like this is worth the added
> confusion.
>
> Another possible option: start a new (local) branch right before the dreamweb
> merge, commit the original sources into that, and then merge that branch back
> into master. Not perfect, but we'll then have the original sources in git in
> any case, without having to re-do the changes that have been done.
>
> By the way, the reason why I have sometimes mention grafting for external
> history for engines merged without history is that the history often is only of
> interest to a few people (and even then probably only a few times), and they
> could then graft the history into their local repo.
>
> -Willem Jan
>
> ------------------------------------------------------------------------------
> EditLive Enterprise is the world's most technically advanced content
> authoring tool. Experience the power of Track Changes, Inline Image
> Editing and ensure content is compliant with Accessibility Checking.
> http://p.sf.net/sfu/ephox-dev2dev
> _______________________________________________
> Scummvm-devel mailing list
> Scummvm-devel at lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/scummvm-devel
More information about the Scummvm-devel
mailing list