Mercurial > hg > mercurial
annotate mercurial-server/src/META-INF/build-server-plugin-mercurial.xml @ 276:8c10f5cec37d
TW-17797 Fix merge-base calculation
Add MergeBaseCommand and 2 its implementations. Implementation for hg
1.7+ uses revsets to get last common ancestors. Implementation for hg
<1.7 calculates merge-base manually using information about parents.
author | Dmitry Neverov <dmitry.neverov@jetbrains.com> |
---|---|
date | Thu, 04 Aug 2011 12:04:38 +0400 |
parents | 643fa1236f4e |
children | 8c1fd2e565ae |
rev | line source |
---|---|
266
643fa1236f4e
Fix file encoding
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
256
diff
changeset
|
1 <?xml version="1.0" encoding="UTF-8"?> |
643fa1236f4e
Fix file encoding
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
256
diff
changeset
|
2 <!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd"> |
643fa1236f4e
Fix file encoding
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
256
diff
changeset
|
3 |
643fa1236f4e
Fix file encoding
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
256
diff
changeset
|
4 <beans default-autowire="constructor"> |
643fa1236f4e
Fix file encoding
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
256
diff
changeset
|
5 <bean id="mercurialServer" class="jetbrains.buildServer.buildTriggers.vcs.mercurial.MercurialVcsSupport" /> |
643fa1236f4e
Fix file encoding
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
256
diff
changeset
|
6 <bean id="config" class="jetbrains.buildServer.buildTriggers.vcs.mercurial.PluginConfigImpl" /> |
276
8c10f5cec37d
TW-17797 Fix merge-base calculation
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
266
diff
changeset
|
7 <bean id="commandFactory" class="jetbrains.buildServer.buildTriggers.vcs.mercurial.CommandFactory" /> |
266
643fa1236f4e
Fix file encoding
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
256
diff
changeset
|
8 </beans> |