{"thread":{"id":"26576","subject":"libreoffice merge issue #2 ...","startedAt":"2011-02-22T14:20:33Z","lastAt":"2011-02-22T14:20:33Z","messageCount":1,"participants":["Michael Meeks"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"161882","messageId":"1298384433.32648.161.camel@lenovo-w500","threadId":"26576","inReplyTo":null,"subject":"libreoffice merge issue #2 ...","fromName":"Michael Meeks","fromEmail":"michael.meeks@novell.com","sentAt":"2011-02-22T14:20:33Z","receivedAt":"2011-02-22T14:20:33Z","isPatch":false,"sender":{"key":"michael.meeks@novell.com","avatar":null},"body":"Hi guys,\n\n\tSo - again, I'm a clueless git user :-) basically the same setup and\nreproduction issue as last time, except I'm now purely using (hopefully)\na stable git: version 1.7.3.4\n\nSetup:\n        git clone git://anongit.freedesktop.org/libreoffice/libs-core\n        git checkout integration/dev300_m98\n\tgit remote add stage git://anongit.freedesktop.org/libreoffice/staging/libs-core\n        git fetch stage\n\nReproduce:\n\tgit merge stage/dev300\n\n\tThen have a look at:\n\n\tucb/qa/complex/tdoc/CheckTransientDocumentsDocumentContent.java\n\n\ta file that (AFAICS) we have made no change on in our master branch,\nbut has had a couple of changes in dev300; I see sections like this:\n\nimport com.sun.star.ucb.XContent;\n<<<<<<< HEAD\nimport com.sun.star.ucb.XContentAccess;\nimport com.sun.star.ucb.XContentIdentifier;\nimport com.sun.star.ucb.XContentIdentifierFactory;\nimport com.sun.star.ucb.XContentProvider;\n=======\n>>>>>>> stage/ooo/dev300\n\n\tI would expect no conflicts. These conflicts seem to come from a later\ncommit on the ooo/dev300 branch:\n\ncommit 01ed463f7e1ea8b5d290273203386c0a76378c08\nAuthor: Lars Langhans <lla@openoffice.org>\nDate:   Tue Jun 8 08:35:09 2010 +0200\n\n    sb123:#i111449# cleanups in ucb qa/complex tests\n\n\tyet, this was based on the previous commit:\n\ncommit 89f7530c91745d16ab2cb59014c7b1543967e0b4\nAuthor: Jens-Heiner Rechtien <hr@openoffice.org>\nDate:   Fri Feb 12 15:01:35 2010 +0100\n\n    changefileheader2: #i109125#: change source file copyright notice\nfrom Sun Microsystems to Oracle; remove CVS style keywords (RCSfile,\nRevision)\n\n\tThat is present (although clearly with a different hash) in both\nrepositories.\n\n\tSo if I have a branch with commits A -> F and master has commits A -> D\n- (and nothing else) I would expect merging that branch to yield state\n'F' without conflicts; but most likely I'm missing something, and\nperhaps there is some subtle (whitespace related?) difference that I do\nnot see.\n\n\tOf course, this is not the only instance I see of this sort of thing,\nbut hopefully it is a reasonably simple one, for a file with only a\nhandful of commits.\n\n\tKendy - do you think this could be caused by the application of the\nde-tab-ification logic ? or do you apply that for every change ?\n\n\tThanks,\n\n\t\tMichael.\n\n-- \n michael.meeks@novell.com  <><, Pseudo Engineer, itinerant idiot\n"}]}