To configure your repository to always rebase when pulling;
git config branch.master.rebase true
which turns the relevant section of your '.git/config' from
[branch "master"]
| package auctionsniper.util; | |
| import org.jmock.Expectations; | |
| import org.jmock.Mockery; | |
| import org.jmock.integration.junit4.JMock; | |
| import org.junit.Test; | |
| import org.junit.runner.RunWith; | |
| import java.util.EventListener; |
| # my _config.yml section | |
| root: / | |
| permalink: /blog/:year/:month/:day/:title/ | |
| source: source | |
| destination: public/blog | |
| code_dir: downloads/code | |
| category_dir: blog/categories | |
| This deploys fine to github pages (https://github.com/tobyweston/blog) and with a CNAME badrobot.com |
| public static class ButtWipe { | |
| public static <K, V> MapBuilder<K, V> map(K key, V value) { | |
| return new MapBuilder<K, V>().map(key, value); | |
| } | |
| public static class MapBuilder<K, V> extends HashMap<K, V> { | |
| private MapBuilder() { | |
| } |
| Name: Interrupter-Thread-1 | |
| State: BLOCKED on java.lang.Object@381eb0c6 owned by: main | |
| Total blocked: 1 Total waited: 0 | |
| Stack trace: | |
| org.jmock.lib.concurrent.Synchroniser.synchroniseInvocation(Synchroniser.java:82) | |
| org.jmock.lib.concurrent.Synchroniser.access$000(Synchroniser.java:23) | |
| org.jmock.lib.concurrent.Synchroniser$1.invoke(Synchroniser.java:74) | |
| org.jmock.lib.legacy.ClassImposteriser$4.invoke(ClassImposteriser.java:136) | |
| com.google.code.tempusfugit.temporal.Clock$$EnhancerByCGLIB$$489249d6.create(<generated>) |
| public static class SingleThreadedPolicyAvoidingFinaliseProblems extends SingleThreadedPolicy { | |
| @Override | |
| public Invokable synchroniseAccessTo(final Invokable mockObject) { | |
| final Invokable synchronizedMockObject = super.synchroniseAccessTo(mockObject); | |
| return new Invokable() { | |
| @Override | |
| public Object invoke(Invocation invocation) throws Throwable { | |
| if (Thread.currentThread().getName().equalsIgnoreCase("Finalizer")) | |
| return mockObject.invoke(invocation); | |
| return synchronizedMockObject.invoke(invocation); |
| class ProductionHibernateConfiguration implements HibernateConfiguration { | |
| @Override | |
| public Properties getProperties(String connectionUrl, String userName, String password) { | |
| Properties properties = new Properties(); | |
| properties.setProperty("hibernate.connection.driver_class", "net.bull.javamelody.JdbcDriver"); | |
| properties.setProperty("hibernate.connection.driver", "oracle.jdbc.driver.OracleDriver"); | |
| properties.setProperty("hibernate.connection.url", connectionUrl); | |
| properties.setProperty("hibernate.connection.username", userName); | |
| properties.setProperty("hibernate.connection.password", password); | |
| properties.setProperty("hibernate.dialect", "org.hibernate.dialect.Oracle10gDialect"); |
| public class TaxRate extends AbstractValueType<Double> { | |
| public static TaxRate taxRate(Double value) { | |
| return new TaxRate(value); | |
| } | |
| private TaxRate(Double value) { | |
| super(value); | |
| } |
| <expenses type="array"> | |
| <expense> | |
| <nominal-code>285</nominal-code> | |
| <expense-type>Accommodation and Meals</expense-type> | |
| <dated-on type="date">2011-12-05T00:00:00Z</dated-on> | |
| <gross-value type="decimal">-8.85</gross-value> | |
| <sales-tax-rate type="decimal">20.0</sales-tax-rate> | |
| <description>Subsistence</description> | |
| <manual-sales-tax-amount type="decimal">0.09</manual-sales-tax-amount> | |
| </expense> |
To configure your repository to always rebase when pulling;
git config branch.master.rebase true
which turns the relevant section of your '.git/config' from
[branch "master"]
| import org.scalatest.FunSuite | |
| class RecursionTest extends FunSuite { | |
| case class Explosion(message: String) extends RuntimeException | |
| object Bomb { | |
| def tick(countdown: Int): Int = { | |
| println("hello") | |
| if (countdown == 0) throw new Explosion("BOOOOM!") |