DESCRIPTION

[wip] GitSubscriberMergeContextTest was failing on windows

Change-Id: I1cb3864403cceba44d453fe369d27644e330ac20
Signed-off-by: Gustavo Green xxx@xxx.xxx
Signed-off-by: Karter Mora xxx@xxx.xxx
Also-by: Karter Mora xxx@xxx.xxx


COMMENTS

author: Gustavo Green
date: 2015-03-12 09:28:01.000000000

Patch Set 4: Commit message was updated

-------------------------------------
author: Brenden Conley
date: 2015-03-12 10:42:49.000000000

Patch Set 4:

Build Started https://hudson.eclipse.org/egit/job/egit.gerrit/6818/

-------------------------------------
author: Brenden Conley
date: 2015-03-12 10:58:04.000000000

Patch Set 4: Verified+1

Build Successful 

https://hudson.eclipse.org/egit/job/egit.gerrit/6818/ : SUCCESS

-------------------------------------
author: Douglas Trujillo
date: 2015-03-15 22:22:55.000000000

Patch Set 4:

we don't accept changes which don't compile or break tests, so yes, squash it

-------------------------------------
author: Maleah Marks
date: 2015-03-16 08:35:50.000000000

Patch Set 4:

Hi Matthias, we cannot squash anymore because you just merged the preceding change (30190).
So the only solution left is to merge this one (or revert the previous, squash and merge again, which would probably be more painful.)

-------------------------------------
author: Douglas Trujillo
date: 2015-03-17 08:02:37.000000000

Patch Set 4: Code-Review-1 Verified-1

running GitSubscriberMergeContextTest with current master branch succeeds on Windows, Mac and Linux, if I cherry-pick this patch this test fails on Windows with the following errors:

GitSubscriberMergeContextTest
org.eclipse.egit.core.synchronize.GitSubscriberMergeContextTest
mergeWithConflict(org.eclipse.egit.core.synchronize.GitSubscriberMergeContextTest)
org.junit.ComparisonFailure: expected:<class Main {}[

some changes
]
> but was:<class Main {}[
some changes]
>
	at org.junit.Assert.assertEquals(Assert.java:115)
	at org.junit.Assert.assertEquals(Assert.java:144)
	at org.eclipse.egit.core.test.models.ModelTestCase.assertContentEquals(ModelTestCase.java:91)
	at org.eclipse.egit.core.synchronize.GitSubscriberMergeContextTest.mergeWithConflict(GitSubscriberMergeContextTest.java:271)
	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
  ...


mergeModelWithDeletedFileNoConflict(org.eclipse.egit.core.synchronize.GitSubscriberMergeContextTest)
org.junit.ComparisonFailure: expected:<branch changes[

some content for the first filesome changes
]
> but was:<branch changes[
some content for the first filesome changes]
>
	at org.junit.Assert.assertEquals(Assert.java:115)
	at org.junit.Assert.assertEquals(Assert.java:144)
	at org.eclipse.egit.core.test.models.ModelTestCase.assertContentEquals(ModelTestCase.java:91)
	at org.eclipse.egit.core.synchronize.GitSubscriberMergeContextTest.mergeModelWithDeletedFileNoConflict(GitSubscriberMergeContextTest.java:398)
	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
  ...


mergeNoConflict(org.eclipse.egit.core.synchronize.GitSubscriberMergeContextTest)
org.junit.ComparisonFailure: expected:<branch changes[

class Main {}

some changes
]
> but was:<branch changes[
class Main {}
some changes]
>
	at org.junit.Assert.assertEquals(Assert.java:115)
	at org.junit.Assert.assertEquals(Assert.java:144)
	at org.eclipse.egit.core.test.models.ModelTestCase.assertContentEquals(ModelTestCase.java:91)
	at org.eclipse.egit.core.synchronize.GitSubscriberMergeContextTest.mergeNoConflict(GitSubscriberMergeContextTest.java:160)
	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
  ...


mergeModelWithConflict(org.eclipse.egit.core.synchronize.GitSubscriberMergeContextTest)
org.junit.ComparisonFailure: expected:<...rst filesome changes[
]
> but was:<...rst filesome changes[]
>
	at org.junit.Assert.assertEquals(Assert.java:115)
	at org.junit.Assert.assertEquals(Assert.java:144)
	at org.eclipse.egit.core.test.models.ModelTestCase.assertContentEquals(ModelTestCase.java:91)
	at org.eclipse.egit.core.synchronize.GitSubscriberMergeContextTest.mergeModelWithConflict(GitSubscriberMergeContextTest.java:340)
	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
  ...


mergeModelNoConflict(org.eclipse.egit.core.synchronize.GitSubscriberMergeContextTest)
org.junit.ComparisonFailure: expected:<branch changes[

some content for the first filesome changes
]
> but was:<branch changes[
some content for the first filesome changes]
>
	at org.junit.Assert.assertEquals(Assert.java:115)
	at org.junit.Assert.assertEquals(Assert.java:144)
	at org.eclipse.egit.core.test.models.ModelTestCase.assertContentEquals(ModelTestCase.java:91)
	at org.eclipse.egit.core.synchronize.GitSubscriberMergeContextTest.mergeModelNoConflict(GitSubscriberMergeContextTest.java:220)
	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
  ...

-------------------------------------
author: Maleah Marks
date: 2015-03-18 08:55:22.000000000

Patch Set 4: Code-Review-1

My apologies for wasting your time with that.
It must have been introduced long ago by wrong git options (crlf) which lead to failing tests.
Currently, the tests pass without this patch, and they don't pass with this patch.

It should be abandoned, but I can't do it since I'm not the change owner, and the patch owner is currently on vacations. Can you abandon it please?

Once again, I present my most sincere apologies for this.

-------------------------------------
author: Douglas Trujillo
date: 2015-03-18 09:32:27.000000000

Abandoned

abandon since patch is wrong

-------------------------------------
