From: Norbert Thiebaud <nthiebaud@gmail.com>
To: michael.meeks@novell.com
Cc: git@vger.kernel.org, kendy <kendy@novell.com>
Subject: Re: libreoffice merge issue ...
Date: Mon, 14 Feb 2011 10:52:26 -0600 [thread overview]
Message-ID: <AANLkTik9icGApTP+0C+ANWsLZBb8HVTXo-cyW3kKEppw@mail.gmail.com> (raw)
In-Reply-To: <1297699635.31477.253.camel@lenovo-w500>
On Mon, Feb 14, 2011 at 10:07 AM, Michael Meeks
<michael.meeks@novell.com> 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@novell.com <><, Pseudo Engineer, itinerant idiot
>
>
>
next prev parent reply other threads:[~2011-02-14 16:52 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-14 16:07 libreoffice merge issue Michael Meeks
2011-02-14 16:52 ` Norbert Thiebaud [this message]
2011-02-14 17:26 ` Ferry Huberts
2011-02-14 17:33 ` Norbert Thiebaud
2011-02-15 9:45 ` Jeff King
2011-02-15 18:46 ` Junio C Hamano
2011-02-16 2:57 ` Jeff King
2011-02-16 21:30 ` Junio C Hamano
2011-04-21 14:01 ` Damien Wyart
2011-04-29 12:55 ` Jeff King
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=AANLkTik9icGApTP+0C+ANWsLZBb8HVTXo-cyW3kKEppw@mail.gmail.com \
--to=nthiebaud@gmail.com \
--cc=git@vger.kernel.org \
--cc=kendy@novell.com \
--cc=michael.meeks@novell.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).