You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@stanbol.apache.org by Fabian Christ <ch...@googlemail.com> on 2012/03/21 18:24:39 UTC
Re: svn commit: r1303404 - in /incubator/stanbol/branches/0.9.0-incubating:
./ contenthub/ entityhub/generic/core/src/main/java/org/apache/stanbol/entityhub/core/site/AbstractEntitySearcher.java
reasoners/
Hi Alessandro,
are you sure that this merge did was you intended to merge? I do not
see any changes for the refactor engine here...
Best,
- Fabian
Am 21. März 2012 15:25 schrieb <al...@apache.org>:
> Author: alexdma
> Date: Wed Mar 21 14:25:08 2012
> New Revision: 1303404
>
> URL: http://svn.apache.org/viewvc?rev=1303404&view=rev
> Log:
> Merging latest refactor engine changes [1303390:HEAD] into branch
>
> Modified:
> incubator/stanbol/branches/0.9.0-incubating/ (props changed)
> incubator/stanbol/branches/0.9.0-incubating/contenthub/ (props changed)
> incubator/stanbol/branches/0.9.0-incubating/entityhub/generic/core/src/main/java/org/apache/stanbol/entityhub/core/site/AbstractEntitySearcher.java (props changed)
> incubator/stanbol/branches/0.9.0-incubating/reasoners/ (props changed)
>
> Propchange: incubator/stanbol/branches/0.9.0-incubating/
> ------------------------------------------------------------------------------
> Merged /incubator/stanbol/trunk:r1303391-1303402
>
> Propchange: incubator/stanbol/branches/0.9.0-incubating/contenthub/
> ------------------------------------------------------------------------------
> Merged /incubator/stanbol/trunk/contenthub:r1303391-1303402
>
> Propchange: incubator/stanbol/branches/0.9.0-incubating/entityhub/generic/core/src/main/java/org/apache/stanbol/entityhub/core/site/AbstractEntitySearcher.java
> ------------------------------------------------------------------------------
> Merged /incubator/stanbol/trunk/entityhub/generic/core/src/main/java/org/apache/stanbol/entityhub/core/site/AbstractEntitySearcher.java:r1303391-1303402
>
> Propchange: incubator/stanbol/branches/0.9.0-incubating/reasoners/
> ------------------------------------------------------------------------------
> Merged /incubator/stanbol/trunk/reasoners:r1303391-1303402
>
>
--
Fabian
http://twitter.com/fctwitt
Re: svn commit: r1303404 - in /incubator/stanbol/branches/0.9.0-incubating:
./ contenthub/ entityhub/generic/core/src/main/java/org/apache/stanbol/entityhub/core/site/AbstractEntitySearcher.java
reasoners/
Posted by Rupert Westenthaler <ru...@gmail.com>.
On Wed, Mar 21, 2012 at 8:53 PM, Alessandro Adamou <ad...@cs.unibo.it> wrote:
> Hi Fabian,
>
>
> On 3/21/12 6:24 PM, Fabian Christ wrote:
>>
>> are you sure that this merge did was you intended to merge? I do not
>> see any changes for the refactor engine here...
>
>
> Neither do I, so I thought you had them already merged. I must have gotten
> something unclear about svn merging. Sorry.
>
> I did the following:
>
> 1. checked out branch/0.9.0-incubating branch-dir
> 2. cd branch-dir
> 3. svn merge -r1303390:HEAD
svn merge -c 1303390 https://svn.apache.org/repos/asf/incubator/stanbol/trunk .
assuming that 1303390 is the revision where you have checked in the
changes you want to merge
best
Rupert
--
| Rupert Westenthaler rupert.westenthaler@gmail.com
| Bodenlehenstraße 11 ++43-699-11108907
| A-5500 Bischofshofen
Re: svn commit: r1303404 - in /incubator/stanbol/branches/0.9.0-incubating:
./ contenthub/ entityhub/generic/core/src/main/java/org/apache/stanbol/entityhub/core/site/AbstractEntitySearcher.java
reasoners/
Posted by Alessandro Adamou <ad...@cs.unibo.it>.
Hi Fabian,
On 3/21/12 6:24 PM, Fabian Christ wrote:
> are you sure that this merge did was you intended to merge? I do not
> see any changes for the refactor engine here...
Neither do I, so I thought you had them already merged. I must have
gotten something unclear about svn merging. Sorry.
I did the following:
1. checked out branch/0.9.0-incubating branch-dir
2. cd branch-dir
3. svn merge -r1303390:HEAD
https://svn.apache.org/repos/asf/incubator/stanbol/trunk .
4. svn ci -m "[message]"
I am trying now again with range 1301611:1302384 . I hope it works.
Sorry again.
Alessandro
> Am 21. März 2012 15:25 schrieb<al...@apache.org>:
>> Author: alexdma
>> Date: Wed Mar 21 14:25:08 2012
>> New Revision: 1303404
>>
>> URL: http://svn.apache.org/viewvc?rev=1303404&view=rev
>> Log:
>> Merging latest refactor engine changes [1303390:HEAD] into branch
>>
>> Modified:
>> incubator/stanbol/branches/0.9.0-incubating/ (props changed)
>> incubator/stanbol/branches/0.9.0-incubating/contenthub/ (props changed)
>> incubator/stanbol/branches/0.9.0-incubating/entityhub/generic/core/src/main/java/org/apache/stanbol/entityhub/core/site/AbstractEntitySearcher.java (props changed)
>> incubator/stanbol/branches/0.9.0-incubating/reasoners/ (props changed)
>>
>> Propchange: incubator/stanbol/branches/0.9.0-incubating/
>> ------------------------------------------------------------------------------
>> Merged /incubator/stanbol/trunk:r1303391-1303402
>>
>> Propchange: incubator/stanbol/branches/0.9.0-incubating/contenthub/
>> ------------------------------------------------------------------------------
>> Merged /incubator/stanbol/trunk/contenthub:r1303391-1303402
>>
>> Propchange: incubator/stanbol/branches/0.9.0-incubating/entityhub/generic/core/src/main/java/org/apache/stanbol/entityhub/core/site/AbstractEntitySearcher.java
>> ------------------------------------------------------------------------------
>> Merged /incubator/stanbol/trunk/entityhub/generic/core/src/main/java/org/apache/stanbol/entityhub/core/site/AbstractEntitySearcher.java:r1303391-1303402
>>
>> Propchange: incubator/stanbol/branches/0.9.0-incubating/reasoners/
>> ------------------------------------------------------------------------------
>> Merged /incubator/stanbol/trunk/reasoners:r1303391-1303402
>>
>>
>
>
--
M.Sc. Alessandro Adamou
Alma Mater Studiorum - Università di Bologna
Department of Computer Science
Mura Anteo Zamboni 7, 40127 Bologna - Italy
Semantic Technology Laboratory (STLab)
Institute for Cognitive Science and Technology (ISTC)
National Research Council (CNR)
Via Nomentana 56, 00161 Rome - Italy
"I will give you everything, so long as you do not demand anything."
(Ettore Petrolini, 1930)
Not sent from my iSnobTechDevice