Hi,
I don't think this is an appropriate way, because SVN isn't informed
about the merging. If you use NetBeans you can select the module und
choose Subversion->merge. Then you select the correct branch module and
it will be merged. After that you can resolve the conflicts and commit.
That's the way I did it.
Markus
Am 15.09.2011 19:14, schrieb Rubén Pérez:
Hi,
I'm not sure what was the way to go, so I'll state here what I've
done. I hope it is OK:
1. I used fisheye to see all the related commits under the
matterhorn-series modules in the 1.2.x branch
2. I went through all the changesets and copied the changes made
there to the trunk files. Sometimes I had to change files outside
the SeriesService, but I didn't touch the UI-related files (only
Java code)
3. I compiled the system to discover that (strangely enough) no
errors are found
What's the next step? Should I create an specific task to commit the
changes to? Is that task already created? Should I wait until
tomorrow's meeting?
Sorry if I'm making questions with obvious answer.
Thanks!
2011/9/14 Christoph Drießen <[email protected] <mailto:[email protected]>>
Hi Chris,
I cannot find any references to the oai-pmh module in 1.2.x. Did
it not make into the release?
Christoph
Am 14.09.2011 um 00:57 schrieb Christopher Brooks:
> As wrapped up as possible by Friday I hope, so we can focus on pain
> points!
>
> Chris
>
> On Tue, 13 Sep 2011 18:24:38 +0000 "McKenzie, Adam"
> <[email protected] <mailto:[email protected]>> wrote:
>
>> Hi Chris,
>>
>> I am okay with the date/time what in particular were you hoping to
>> discuss in this meeting? Is this a coordination meeting before
>> everyone gets started, a check in time after everyone has had a
>> chance to take a quick look over their merges or they should be
>> mostly wrapped up discussing any pitfalls people have bumped into?
>>
>> Thanks,
>> Adam
>>
>> -----Original Message-----
>> From: [email protected]
<mailto:[email protected]>
>> [mailto:[email protected]
<mailto:[email protected]>] On Behalf Of
>> Christopher Brooks Sent: Tuesday, September 13, 2011 10:41 AM To:
>> Opencast Matterhorn Subject: Re: [Opencast Matterhorn] 1.2 Merging
>>
>> Hi,
>>
>> Sorry, this friday, the 16th. A meeting for no more than one hour.
>>
>> Chris
>>
>>
>> On Tue, 13 Sep 2011 18:33:11 +0200
>> Christoph Drießen <[email protected] <mailto:[email protected]>> wrote:
>>
>>> On which day?
>>>
>>> Christoph
>>>
>>>
>>>
>>> Am 13.09.2011 um 17:40 schrieb Christopher Brooks:
>>>
>>>> Hi,
>>>>
>>>> As of the team meeting today, here are a list of modules and
>>>> persons who have been "assigned" to help do the merges. We're
>>>> planning to have a meeting to discuss this, could each of these
>>>> people please verify if 9:00am GMT -6 would work for them?
>>>>
>>>>>> matjaz: docs/scripts
>>>>>> akm: modules/matterhorn-capture-admin-service-impl
>>>>>> akm: modules/matterhorn-capture-agent-impl
>>>>>> cdriessen: modules/matterhorn-oaipmh
>>>>>> ruben: modules/matterhorn-series-service-impl/
>>>>>> micah: modules/matterhorn-ingest-service-impl
>>>>>> micah: modules/matterhorn-static
>>>>>> micah: modules/matterhorn-search-service-impl
>>>>>> micah: shared-resources/
>>>>>> mmoorman: modules/matterhorn-admin-ui tobias
>>>>>> modules/matterhorn-test-harness tobias
>>>>>> modules/matterhorn-userdirectory-ldap
>>>>>> tobias modules/matterhorn-kernel
>>>>>> tobias docs/felix
>>>>>> tobias modules/matterhorn-conductor tobias
>>>>>> modules/matterhorn-common tobias
>>>>>> modules/matterhorn-workflow-service-impl
>>>>>> tobias .
>>>>
>>>> --
>>>> Christopher Brooks, BSc, MSc
>>>> ARIES Laboratory, University of Saskatchewan
>>>>
>>>> Web: http://www.cs.usask.ca/~cab938
<http://www.cs.usask.ca/%7Ecab938>
>>>> Phone: 1.306.966.1442
>>>> Mail: Advanced Research in Intelligent Educational Systems
>>>> Laboratory Department of Computer Science
>>>> University of Saskatchewan
>>>> 176 Thorvaldson Building
>>>> 110 Science Place
>>>> Saskatoon, SK
>>>> S7N 5C9
>>>> _______________________________________________
>>>> Matterhorn mailing list
>>>> [email protected]
<mailto:[email protected]>
>>>> http://lists.opencastproject.org/mailman/listinfo/matterhorn
>>>>
>>>>
>>>> To unsubscribe please email
>>>> [email protected]
<mailto:[email protected]>
>>>> _______________________________________________
>>>
>>> _______________________________________________
>>> Matterhorn mailing list
>>> [email protected]
<mailto:[email protected]>
>>> http://lists.opencastproject.org/mailman/listinfo/matterhorn
>>>
>>>
>>> To unsubscribe please email
>>> [email protected]
<mailto:[email protected]>
>>> _______________________________________________
>>
>>
>>
>> --
>> Christopher Brooks, BSc, MSc
>> ARIES Laboratory, University of Saskatchewan
>>
>> Web: http://www.cs.usask.ca/~cab938
<http://www.cs.usask.ca/%7Ecab938>
>> Phone: 1.306.966.1442
>> Mail: Advanced Research in Intelligent Educational Systems
Laboratory
>> Department of Computer Science
>> University of Saskatchewan
>> 176 Thorvaldson Building
>> 110 Science Place
>> Saskatoon, SK
>> S7N 5C9
>> _______________________________________________
>> Matterhorn mailing list
>> [email protected]
<mailto:[email protected]>
>> http://lists.opencastproject.org/mailman/listinfo/matterhorn
>>
>>
>> To unsubscribe please email
>> [email protected]
<mailto:[email protected]>
>> _______________________________________________
>> _______________________________________________
>> Matterhorn mailing list
>> [email protected]
<mailto:[email protected]>
>> http://lists.opencastproject.org/mailman/listinfo/matterhorn
>>
>>
>> To unsubscribe please email
>> [email protected]
<mailto:[email protected]>
>> _______________________________________________
>
>
>
> --
> Christopher Brooks, BSc, MSc
> ARIES Laboratory, University of Saskatchewan
>
> Web: http://www.cs.usask.ca/~cab938
<http://www.cs.usask.ca/%7Ecab938>
> Phone: 1.306.966.1442
> Mail: Advanced Research in Intelligent Educational Systems
Laboratory
> Department of Computer Science
> University of Saskatchewan
> 176 Thorvaldson Building
> 110 Science Place
> Saskatoon, SK
> S7N 5C9
> _______________________________________________
> Matterhorn mailing list
> [email protected]
<mailto:[email protected]>
> http://lists.opencastproject.org/mailman/listinfo/matterhorn
>
>
> To unsubscribe please email
> [email protected]
<mailto:[email protected]>
> _______________________________________________
_______________________________________________
Matterhorn mailing list
[email protected] <mailto:[email protected]>
http://lists.opencastproject.org/mailman/listinfo/matterhorn
To unsubscribe please email
[email protected]
<mailto:[email protected]>
_______________________________________________
_______________________________________________
Matterhorn mailing list
[email protected]
http://lists.opencastproject.org/mailman/listinfo/matterhorn
To unsubscribe please email
[email protected]
_______________________________________________
_______________________________________________
Matterhorn mailing list
[email protected]
http://lists.opencastproject.org/mailman/listinfo/matterhorn
To unsubscribe please email
[email protected]
_______________________________________________
