Mercurial > jhg
changeset 643:a8ce405da1f5
v1.2 line of dev: update versions, use patch merge code by default
| author | Artem Tikhomirov <tikhomirov.artem@gmail.com> |
|---|---|
| date | Wed, 19 Jun 2013 16:03:11 +0200 |
| parents | 9ef1fab9f5e3 |
| children | 1deea2f33218 |
| files | build.gradle build.xml src/org/tmatesoft/hg/internal/Internals.java |
| diffstat | 3 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/build.gradle Tue Jun 11 16:32:12 2013 +0200 +++ b/build.gradle Wed Jun 19 16:03:11 2013 +0200 @@ -16,7 +16,7 @@ */ def isRelease = false - version = '1.1.0-SNAPSHOT' + version = '1.2.0-SNAPSHOT' description = 'Pure Java API and Toolkit for Mercurial DVCS' group = 'org.tmatesoft.hg4j'
--- a/build.xml Tue Jun 11 16:32:12 2013 +0200 +++ b/build.xml Wed Jun 19 16:03:11 2013 +0200 @@ -27,7 +27,7 @@ <property name="junit.jar" value="lib/junit-4.8.2.jar" /> <property name="ver.qualifier" value="" /> - <property name="version.lib" value="1.1.0" /> + <property name="version.lib" value="1.2" /> <property name="version.jar" value="${version.lib}${ver.qualifier}" /> <property name="compile-with-debug" value="yes"/>
--- a/src/org/tmatesoft/hg/internal/Internals.java Tue Jun 11 16:32:12 2013 +0200 +++ b/src/org/tmatesoft/hg/internal/Internals.java Wed Jun 19 16:03:11 2013 +0200 @@ -142,7 +142,7 @@ final PropertyMarshal pm = new PropertyMarshal(ctx); boolean shallCacheRevlogsInRepo = pm.getBoolean(CFG_PROPERTY_REVLOG_STREAM_CACHE, true); streamProvider = new RevlogStreamFactory(this, shallCacheRevlogsInRepo); - shallMergePatches = pm.getBoolean(Internals.CFG_PROPERTY_PATCH_MERGE, false); + shallMergePatches = pm.getBoolean(Internals.CFG_PROPERTY_PATCH_MERGE, true); } public boolean isInvalid() {