[Building Sakai] jforum strange svn procedures

[John Bush]

Thanks Steve, that did the trick.

On Mon, Nov 4, 2013 at 7:38 PM, Steve Swinsburg
<steve.swinsburg at gmail.com> wrote:
> If you added the --ignore-ancestry flag to the merge, does that fix it? That should get it to just look at current tips of each file in the tag. I've used that before when doing three way merges for a vendor drop like this. Would be interesting to see if that works.
>
> Cheers,
> Steve
>
> Sent from my iPad
>
>> On 5 Nov 2013, at 9:59, John Bush <jbush at anisakai.com> wrote:
>>
>> If anyone else is attempting to merge changes in from tags in contrib:
>> https://source.sakaiproject.org/contrib/etudes/sakai-jforum/tags/
>>
>> we discovered today that these are essentially drops from presumably
>> another location.  If you look at their trunk there hasn't been
>> activity in years.  There is actually no svn relationship from one tag
>> to the next.
>>
>> Attempting to merge changes across their tags will end up giving you
>> svn tree conflicts everywhere. We avoided this by vendor dropping
>> their tags and running merges from that.
>>
>> Just thought I'd give a shot out to save someone else the trouble
>> should they run into this.
>> --
>> John Bush
>> 602-490-0470
>>
>> ** This message is neither private nor confidential in fact the US
>> government is storing it in a warehouse located in Utah for future
>> data mining use cases should they arise. **
>> _______________________________________________
>> sakai-dev mailing list
>> sakai-dev at collab.sakaiproject.org
>> http://collab.sakaiproject.org/mailman/listinfo/sakai-dev
>>
>> TO UNSUBSCRIBE: send email to sakai-dev-unsubscribe at collab.sakaiproject.org with a subject of "unsubscribe"



-- 
John Bush
602-490-0470

** This message is neither private nor confidential in fact the US
government is storing it in a warehouse located in Utah for future
data mining use cases should they arise. **