Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Clean up branches #92

Closed
MurphyMc opened this issue Jul 31, 2013 · 4 comments
Closed

Clean up branches #92

MurphyMc opened this issue Jul 31, 2013 · 4 comments
Assignees

Comments

@MurphyMc
Copy link
Collaborator

I thing we need to clean up the branches in the main repository. I've commented on the existing branches; if you have a stake, please comment back. :)

debugger: Maybe we want to keep this. I know it has some debugger-specific stuff. The IO loop stuff (or its equivalent) should still get mainlined at some point. Though the mass of development on this is now in another fork, maybe?

debugger_legacy, debugger_legacy_2012-06-27: These haven't changed in a year. Do we need them?

fix_license: Any relevant changes should be in carp now. Delete.

master: The master branch should never have existed in the first place and should be equivalent to angler. Delete.

upgrade_switch / upgrade_switch_2: carp has moved so far ahead of these and fixed so many bugs that I claim anything relying on these should unquestionably be fixed to use carp. Delete.

@ghost ghost assigned colin-scott and andiwundsam Jul 31, 2013
@colin-scott
Copy link
Contributor

FWIW, our fork of debugger branch (https://github.com/ucb-sts/pox) is only ~6 commits ahead of your debugger branch. We're only doing that as a stop-gap for getting Andrew push permissions.

Eventually (after NSDI), we'd like to move entirely to carp, so that we can blow away debugger branch entirely.

@andiwundsam can you comment on whether debugger_legacy* have anything important in them? My guess is not.

Otherwise, I agree with these changes.

@ghost ghost assigned andiwundsam Jul 31, 2013
@MurphyMc
Copy link
Collaborator Author

Thanks so much for the quick response, Colin.

Assigning Andi.

@andiwundsam
Copy link

I can't think of any reason we'd need debugger_legacy* for anything. Maybe let's keep a backup tar of the repo around 'just in case' before we prune. Otherwise delete.

@ghost ghost assigned MurphyMc Jul 31, 2013
@MurphyMc
Copy link
Collaborator Author

MurphyMc commented Aug 4, 2013

Backed up and cleaned up.

Ahh, the branch list is so beautiful now.

@MurphyMc MurphyMc closed this as completed Aug 4, 2013
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

3 participants