>I think the question is:
>* you have a branch A that is based off of branch B
>* you want to switch it so that branch A is based off of branch C.
>
>I don't actually know if there's a good way to do that. Obviously you could
>do a diff between B and A (logic and your custom branch), and then apply
>that diff to C (1.5.x) but that sounds like a lot of work.
>
>-Darius
>
>On Sat, Nov 7, 2009 at 6:00 AM, Ben Wolfe <
[hidden email]> wrote:
>
>> A tag is just a branch that shouldn't be committed to. So you can merge
>> the same way you would merge from any other branch.
>>
>> This wiki page describes my personal technique:
>>
http://openmrs.org/wiki/Subversion_Branching_and_Merging_Techniques>>
>> Ben
>>
>>
>> Tammy Dugan wrote:
>>
>>> An old version of the logic branch which I think is gone now. This is the
>>> name of the openmrs jar when I build it:
>>>
>>> openmrs-api-1.5.0.10396-dev
>>>
>>> I need to catch up our custom build to the latest stable version of 1.5. I
>>> am just not sure how to do it.
>>>
>>> Thanks,
>>>
>>> Tammy Dugan
>>>
>>> Darius Jazayeri wrote:
>>>
>>>> I'm not sure I understand the question. What is your custom build
>>>> currently based on?
>>>>
>>>> -Darius
>>>>
>>>> On Fri, Nov 6, 2009 at 11:21 AM, Tammy Dugan <
[hidden email] <mailto:
>>>>
[hidden email]>> wrote:
>>>>
>>>> How do I merge the 1.5.0 tag into my custom openmrs build?
>>>>
>>>> Thanks,
>>>>
>>>> Tammy Dugan
>>>>
>>>> _________________________________________
>>>>
>>>> To unsubscribe from OpenMRS Developers' mailing list, send an
>>>> e-mail to
[hidden email]
>>>> <mailto:
[hidden email]> with "SIGNOFF
>>>> openmrs-devel-l" in the body (not the subject) of your e-mail.
>>>>
>>>> [mailto:
[hidden email]
>>>> <mailto:
[hidden email]>?body=SIGNOFF%20openmrs-devel-l]
>>>>
>>>>
>>>> ------------------------------------------------------------------------
>>>> Click here to unsubscribe <mailto:
[hidden email]?body=SIGNOFF%20openmrs-devel-l>
>>>> from OpenMRS Developers' mailing list
>>>>
>>>
>>> _________________________________________
>>>
>>> To unsubscribe from OpenMRS Developers' mailing list, send an e-mail to
>>>
[hidden email] with "SIGNOFF openmrs-devel-l" in the body
>>> (not the subject) of your e-mail.
>>>
>>> [mailto:
[hidden email]?body=SIGNOFF%20openmrs-devel-l]
>>>
>>
>> _________________________________________
>>
>> To unsubscribe from OpenMRS Developers' mailing list, send an e-mail to
>>
[hidden email] with "SIGNOFF openmrs-devel-l" in the body
>> (not the subject) of your e-mail.
>>
>> [mailto:
[hidden email]?body=SIGNOFF%20openmrs-devel-l]
>>
>
>_________________________________________
>
>To unsubscribe from OpenMRS Developers' mailing list, send an e-mail to
[hidden email] with "SIGNOFF openmrs-devel-l" in the body (not the subject) of your e-mail.
>
>[mailto:
[hidden email]?body=SIGNOFF%20openmrs-devel-l]
