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

Move to collective? Also, fix svn switch handling. #8

Merged
merged 11 commits into from
Mar 11, 2012

Conversation

rpatterson
Copy link
Contributor

If you like, we can just leave this in the collective, in which case you can ignore this pull request and just give me PyPI release rights. Otherwise, it would be great if you could merge this and cut a new release.

I've fixed svn switch handling and updated the tests. I've tested this locally and it works with a real-world code base with lots of refactoring changes between the branch and trunk.

This addresses a few problems:

1. Trying to commit a git repo in a git repo is begging trouble
2. Repo formats my change across releases, using the tools to create
   repos at test runtime means the repos will have the right format
3. Makes much clearer what is supposed to be in the repo
Since the svn switch can leave things in an indeterminate state from
git's perspective including more than just file changes but added and
removed files and directories, we need to use "git checkout -f branch"
to successfully change to the new branch.

Also, the existing branches parsing was missing the current branch
because it wasn't stripping the "*".
@tomster
Copy link
Owner

tomster commented Mar 11, 2012

ross, i've added you as maintainer on PyPI, feel free to make a release, although i strongly would prefer if there'd be a test for your fix. i'm all for keeping this in the collective.

tomster added a commit that referenced this pull request Mar 11, 2012
@tomster tomster merged commit 894eb41 into tomster:master Mar 11, 2012
@rpatterson
Copy link
Contributor Author

Ok, well I can just work from a develop egg locally with the fix and wait to release until someone has time to add a test. Which would you prefer? Cut a release now or wait until someone has the time to add that test?

@tomster
Copy link
Owner

tomster commented Mar 11, 2012

fuck it, make a release :)

@rpatterson
Copy link
Contributor Author

Ugh, sorry Tom, I have username hell and I should have told you my username on PyPI is rpatterson, not rossp as it is on plone.org. Can you change the PyPI maintainer from rossp to rpatterson?

@tomster
Copy link
Owner

tomster commented Mar 11, 2012

done

@rpatterson
Copy link
Contributor Author

...and done. :-)
http://pypi.python.org/pypi/git-svn-helpers/0.9

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

Successfully merging this pull request may close these issues.

2 participants