[Scummvm-devel] Merging remaining GSoC branches (Attention PORTERS!)

[yotam barnoy]

Just for everyone's information, merging with mercurial is actually
worse than with svn itself -- there are far more conflicts to deal
with.

I think this has to do with the fact that hg-subversion doesn't
preserve all the information that svn has when merging, ie. the
parents of the commits. When we update a branch by merging from trunk
(which we do a lot), mercurial just sees a lot of new content, which
causes tons of merge conflicts when merging back to trunk. One could
probably recreate that parental relationship in git with some low
level commands and a lot of work, but for now I'm sticking with svn
merging, even though it's painful.

Yotam


On Tue, Nov 2, 2010 at 2:46 PM, Julien <scummvm at templier.info> wrote:
> You can find a ScummVM mercurial tree here:
> http://bitbucket.org/Littleboy/scummvm
> (it's a direct conversion using hg-subversion, nothing added)
>
> Due to limitations with hg-subversion (or my failure to tweak it properly),
> it only includes tags and branches under scummvm/.
> Shouldn't be a problem if you want to use it to merge recent branches
> though.
>
> Julien
>
>> -----Original Message-----
>> From: Max Horn [mailto:max at quendi.de]
>> Sent: Tuesday, November 02, 2010 8:22 AM
>> To: John Willis
>> Cc: 'ScummVM devel'; 'yotam barnoy'
>> Subject: Re: [Scummvm-devel] Merging remaining GSoC branches (Attention
>> PORTERS!)
>>
>>
>> Am 02.11.2010 um 13:04 schrieb John Willis:
>>
>> >>> Yotam, by all means, go ahead. I see you already merged changes back
>> > into
>> >> that branch. There is no point in waiting for the opengl branch first
> :).
>> >>>
>> >>
>> >> Working on it. Man how I dislike SVN's merge -- can't wait for the move
> to
>> >> git.
>> >
>> > Amen to that, just looking at merging in bits of the GL branch locally
> and
>> > it's like pulling teeth :-o.
>>
>>
>> Youg might be able to make your life easier by first using hg-subversion
> to
>> clone our SVN into a mercurial archive, then perform the merge there, then
>> commit the result back to SVN.
>>
>> This may also be possible using git-svn, but I don't know for sure (my
> git-svn
>> tree does not know anything about SVN branches, it seems, possibly due to
>> the way I originally set it up, which was aaaages ago).
>>
>>
>> Bye,
>> Max
>>
> ----------------------------------------------------------------------------
> --
>> Nokia and AT&T present the 2010 Calling All Innovators-North America
>> contest
>> Create new apps & games for the Nokia N8 for consumers in  U.S. and
>> Canada
>> $10 million total in prizes - $4M cash, 500 devices, nearly $6M in
> marketing
>> Develop with Nokia Qt SDK, Web Runtime, or Java and Publish to Ovi Store
>> http://p.sf.net/sfu/nokia-dev2dev
>> _______________________________________________
>> Scummvm-devel mailing list
>> Scummvm-devel at lists.sourceforge.net
>> https://lists.sourceforge.net/lists/listinfo/scummvm-devel
>
>
> ------------------------------------------------------------------------------
> Nokia and AT&T present the 2010 Calling All Innovators-North America contest
> Create new apps & games for the Nokia N8 for consumers in  U.S. and Canada
> $10 million total in prizes - $4M cash, 500 devices, nearly $6M in marketing
> Develop with Nokia Qt SDK, Web Runtime, or Java and Publish to Ovi Store
> http://p.sf.net/sfu/nokia-dev2dev
> _______________________________________________
> Scummvm-devel mailing list
> Scummvm-devel at lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/scummvm-devel
>