lucenenet-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Christopher Currens <currens.ch...@gmail.com>
Subject Re: svn commit: r1391054 - /lucene.net/branches/3.0.3-2/
Date Thu, 27 Sep 2012 15:45:34 GMT
There are so few changes in the 3.0.3 branch that aren't present in
trunk.  From what I see, there are only three changesets.

* Update version number in AssemblyInfo.cs changes for contrib projects
* Update build scripts/projects with consistent names for contrib projects
* Cleaning and updated TXT files in the trunk.

I think it would be easier to selectively merge those changes into
trunk, instead of trying to merge trunk into the branch, especially
considering that trunk is the latest version of 3.0.3, and not the
branch.  I'll work on this today and get this ready.  I need to make
sure that the scripts and projects merged correctly anyway, otherwise
you're not going to be able to produce any build artifacts.


On Thu, Sep 27, 2012 at 8:25 AM, Christopher Currens
<currens.chris@gmail.com> wrote:
> I created a branch from a revision that is pre-merge...I'm trying to
> get a good clue of what is different between the two branches.
>
> On Thu, Sep 27, 2012 at 8:23 AM, Prescott Nasser <geobmx540@hotmail.com> wrote:
>> careful with 3.0.3, it's still screwy from when I tried to merge changes from the
trunk into it.
>>
>>> Subject: svn commit: r1391054 - /lucene.net/branches/3.0.3-2/
>>> Date: Thu, 27 Sep 2012 15:20:42 +0000
>>> To: commits@lucenenet.apache.org
>>> From: ccurrens@apache.org
>>>
>>> Author: ccurrens
>>> Date: Thu Sep 27 15:20:42 2012
>>> New Revision: 1391054
>>>
>>> URL: http://svn.apache.org/viewvc?rev=1391054&view=rev
>>> Log: (empty)
>>>
>>> Added:
>>>     lucene.net/branches/3.0.3-2/   (props changed)
>>>       - copied from r1383623, lucene.net/branches/3.0.3/
>>>
>>> Propchange: lucene.net/branches/3.0.3-2/
>>> ------------------------------------------------------------------------------
>>> --- svn:mergeinfo (added)
>>> +++ svn:mergeinfo Thu Sep 27 15:20:42 2012
>>> @@ -0,0 +1,2 @@
>>> +/incubator/lucene.net/branches/Lucene.Net.3.0.3/trunk:1199075-1294851*
>>> +/incubator/lucene.net/trunk:1199072-1294798*
>>>
>>>
>>

Mime
View raw message