[opensource-dev] Product Backlog addition request: Build fixes for 64bit out-of-source

Boroondas Gupte sllists at boroon.dasgupta.ch
Sat Aug 28 02:48:23 PDT 2010


 On 08/26/2010 02:37 PM, Boroondas Gupte wrote:
> As some of you might know, I've been working on collecting patches and
> changesets on pJIRA and SVN that allow me to build
> lindenlab/viewer-development
> <http://bitbucket.org/lindenlab/viewer-development> with the settings
> above. I've applied them to my repository at
> http://bitbucket.org/boroondas/snowstorm-development , ported/modified
> them where necessary. I also had Techwolf port some of his own
> patches. (Available on his repo
> <https://bitbucket.org/Techwolf/viewer-development>. Thanks Techwolf!)
>
> The final result, merged with the many changes that came from upstream
> meanwhile, can be found at the current tip (i.e. rev a0292ef66668)
> <http://bitbucket.org/boroondas/snowstorm-development/changeset/a0292ef66668>
> of my repository.
Yesterday, I had to realize that hg was using my graphical merge tool of
choice (meld <http://meld.sourceforge.net/>) differently than I expected
(and different from what |git mergetool| does with it)^[1 <#fn1>] . Thus
most merges where I manually resolved conflicts with meld are probably
faulty. If I'm lucky, only doc/contributions.txt is affected, but I'm
not sure.

To avoid others cloning the faulty merges and applying new commits ontop
of them, I've moved my repository to boroondas/snowstorm-development
DON'T USE THIS REPO! Faulty merges!
<http://bitbucket.org/boroondas/snowstorm-development-dont-use-this-repo-faulty-merges>.
If you already have pulled or cloned from
bitbucket.org/boroondas/snowstorm-development before that, please
refrain to base any work on my merges or be prepared to having to rebase
it. I'll follow up with a new clone at the original location of my
repository soon and will hopefully get the merges right this time.
(KDiff3, with the proper configuration
<http://mercurial.selenic.com/wiki/KDiff3>, seems to augment hg better
than meld, but I'm still new to it so have to be careful.) While I'm at
it, I might also re-do some of the non-merge commits, so for now it
might be saver to base nothing on /any/ commits by me.

Sorry for the inconveniences and please bear with me as I learn all this
stuff.

As the Product Backlog inclusion is supposed to happen even before any
work on the issue is started, I hope it can move forward regardless.

Regards,
Boroondas

------------------------------------------------------------------------
^[1 <#fn1back>] |HGMERGE=meld hg resolve --all| displays three text
fields side-by-side, from left to right: local, base, other. This seemed
very similar to |git mergetool| with meld, which has from left to right:
local, pre-merged, other.|| Thus I assumed that, as with |git mergetool|
with meld, the edited middle field would serve as the merge result, when
with hg, it actually <http://mercurial.selenic.com/wiki/Meld> was the
edited local version in the left-most field. When one edits all 3 fields
in meld until they're equal and then saves them, this doesn't matter,
but I didn't do that in all cases.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.secondlife.com/pipermail/opensource-dev/attachments/20100828/dc9fa45d/attachment.htm 


More information about the opensource-dev mailing list