On Mon, Feb 14, 2011 at 10:07 AM, Michael Meeks
<michael.meeks@xxxxxxxxxx> wrote:
> Hi guys,
>
> We are having quite some fun merging git branches with LibreOffice, and
> I stumbled over this just now with master git with hash:
> 00e6ee724640701b32aca27cc930fd6409c87ae2
>
> Setup (some large repos):
>
> git clone git://anongit.freedesktop.org/libreoffice/libs-core
> git checkout integration/dev300_m98
> git remote add stage git://anongit.freedesktop.org/libreoffice/staging/@REPO@
correction: this should read
git remote add stage
git://anongit.freedesktop.org/libreoffice/staging/libs-core
or you should use ./g instead of git for all these 3 git operations
Norbert
> git fetch stage
>
> Test[1]:
>
> git merge stage/premerge/dev300_m98
> git diff idl/source/cmptools/lex.cxx
>
> yields:
>
> @@@ -147,11 -147,7 +147,15 @@@ SvToken & SvToken::operator = ( const S
> *************************************************************************/
> void SvTokenStream::InitCtor()
> {
> ++<<<<<<< HEAD
> +#ifdef DOS
> + SetCharSet( CHARSET_ANSI );
> +#else
> SetCharSet( gsl_getSystemTextEncoding() );
> +#endif
> ++=======
> ++ SetCharSet( gsl_getSystemTextEncoding() );
> ++>>>>>>> stage/premerge/dev300_m98
> aStrTrue = "TRUE";
> aStrFalse = "FALSE";
> nLine = nColumn = 0;
>
> With the above master hash; whereas with v1.7.3.4 it yields nothing (as
> it should IMHO) - we havn't edited things around that chunk in master.
>
> That is slightly concerning; thoughts much appreciated. Incidentally,
> the whole 'make install' installs into ~/bin was extremely unexpected
> and yielded 30minutes of pain trying to work out what was installed
> where and why, and the interaction with --prefix, and ... now it seems I
> should always run rehash; git --version before any command, and sanity
> check things ;-)
>
> Thanks,
>
> Michael.
>
> [1] - potentially you need:
> [merge]
> renamelimit = 20000
> in your ~/.gitconfig
> --
> michael.meeks@xxxxxxxxxx <><, Pseudo Engineer, itinerant idiot
>
>
>
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html