Should not have Cycamore agent duplicates.

[katyhuff]

This repository is not ready for new contributions. First it should be updated to remove the fuel cycle agents that are present in cycamore. These agents should not be in both recycle and cycamore.

(attention @gtw2 @jbae11 @gwenchee)

[jbae11]

@bam241 @katyhuff
In my attempt to delete all files and history of cycamore:xxx, I used the git filter-branch command. And it seemed to successfully remove the file and history or cycamore:xxx files (here).

However making a pr to cyclus::master is a bit awkward, since doing so would revert what I just did. I think the only option is to run git filter-branch directly in cyclus::master and base all recycle development from there. What do you think?

[bam241]

yes I think you will have to force push it

[jbae11]

so you want me to force push from jbae11:no-cycamore-archetypes to cyclus:master?

[bam241]

I think this is the solution maybe @katyhuff have some thought about this ?

[jbae11]

@katyhuff What are your thoughts on doing this?

[katyhuff]

Honestly, I think that using git rm on the files and then adding them back with git add (it seems that's what you mean by "what I just did," correct me if I'm wrong, @jbae11 ) has made logical or clean solutions likely pretty screwy.

I thought we talked about this in my office?

[jbae11]

@bam241 I cannot seem to force push to cyclus:xxx from jbae11:filter-branch here. I get:

dkadkf@teddy ~/github/no-cycamore-archetypes (filter-branch) $ git push cyc test --force
error: src refspec test does not match any.
error: failed to push some refs to 'https://github.com/cyclus/recycle'

Can you give it a try?

[bam241]

@jbae11:
a git push -u upstream master -f made the trick, that and remove the push protection on recycle/master branch.

[bam241]

it did not work the first time, but the second one was fine :)

(my local branch did not got the right name)

[bam241]

@jbae11 we don't have the archetypes, but we got back all the reference to cycamore :(

[jbae11]

@bam241 here's a better branch can you test it on the cyclus:test branch before doing it on the master? Guess it's too late now though,

[jbae11]

#8 should allow the cyclus:master to successfully build. As mentioned in the PR, the stub_facility is a placeholder (so recycle would build) until an actual archetype in development is merged into cyclus:master

[katyhuff]

can this be closed?