popstr

 Markering - Jul 21, 2013 3:43:47 PM
2013-07-21 15:43:52,476 [      0]   INFO -        #com.intellij.idea.Main - ------------------------------------------------------ IDE STARTED ------------------------------------------------------ 
2013-07-21 15:43:52,485 [      9]   INFO -        #com.intellij.idea.Main - IDE: Android Studio (build #AI-130.745757, 18 Jul 2013 00:00) 
2013-07-21 15:43:52,485 [      9]   INFO -        #com.intellij.idea.Main - OS: Mac OS X (10.8.4) 
2013-07-21 15:43:52,485 [      9]   INFO -        #com.intellij.idea.Main - JRE: 1.6.0_51-b11-456-11M4508 (Apple Inc.) 
2013-07-21 15:43:52,485 [      9]   INFO -        #com.intellij.idea.Main - JVM: 20.51-b01-456 (Apple Inc.) 
2013-07-21 15:43:52,491 [     15]   INFO -        #com.intellij.idea.Main - JVM Args: -ea -Dsun.io.useCanonCaches=false -Djava.net.preferIPv4Stack=true -XX:+UseCodeCacheFlushing -XX:+UseConcMarkSweepGC -XX:SoftRefLRUPolicyMSPerMB=50 -XX:+HeapDumpOnOutOfMemoryError -Xverify:none -Xbootclasspath/a:../lib/boot.jar -Xms128m

popstr

import static junit.framework.Assert.assertEquals;

import java.io.File;
import java.io.FileInputStream;
import java.io.FileWriter;
import java.io.IOException;
import java.net.URISyntaxException;
import java.text.ParseException;

import net.fortuna.ical4j.data.CalendarBuilder;

popstr

@Test
public void testPullRebaseWithLocalCommit() throws Exception {
    PullResult res = target.pull().call();
    // nothing to update since we don't have different data yet
    assertTrue(res.getFetchResult().getTrackingRefUpdates().isEmpty());
    assertEquals(Status.UP_TO_DATE, res.getRebaseResult().getStatus());

    assertFileContentsEqual(targetFile, "Hello world");

    // change the source file