search

falc410 / pysimplesoap

Automatically exported from code.google.com/p/pysimplesoap
0 stars 0 forks source link

Merge from github? #102

Closed GoogleCodeExporter closed 9 years ago

GoogleCodeExporter commented 9 years ago 
Hi,

I've tackled a number of little issues on my github fork: 
https://github.com/rcarmo/pysimplesoap

Feel free to merge these back if you like - I'll probably rework my fork later 
on to use lxml for a little extra speed, but for now I'm happy with it.

Original issue reported on code.google.com by rca...@gmail.com on 25 May 2013 at 1:48

GoogleCodeExporter commented 9 years ago 
Hello Rui: thanks very much for you contributions!

They look good, but as I don't have time right now to test them, please if you 
can, run the tests thoroughly before merging. 
Backward compatibility should not be broken, specially for the project like 
pyafipws: https://code.google.com/p/pyafipws/
If you want to test that, please send me an email and I can provide you the 
test credentials and some instructions.

About lxml, I didn't have nice experiences with third-party XML libraries, if 
would use lxml, please make that optional so we can eventually merge your work.
Remember that this library is used in many "enterprise" environments (at least 
in my case), where compiling dependencies is not an option.

So, I've given you commiter permissions, fell free to merge (with the previous 
considerations, and please keep as much as github commit history as you can)

Best Regards

Mariano

Original comment by reingart@gmail.com on 25 May 2013 at 5:13

GoogleCodeExporter commented 9 years ago 
How about official github mirror?

Original comment by oczk...@gmail.com on 25 May 2013 at 6:14

GoogleCodeExporter commented 9 years ago 
oczkers:

I don't want to move the project to GitHub, I'm not an advanced user of git and 
from some perspectives, googlecode is easier to manage and more "bussiness 
friendly".
Also, I prefer mercurial because, in my experience, it is easier to use for 
newcomers

Said that, if you want to maintain an official github mirror, go ahead ;-) as 
long as  both repositories are sync'ed and no confussion is risen, I'll not 
complain

I'd gave you commit access so you can update the wiki and so on, thanks for 
your contributions too !

Best regards

Mariano

PS1: please, if you can, the __credits__ should be updated to reflect past 
contributors, or maybe we should start to write a credits.txt file
PS2: once merged, please close open issues that you solved in your forks

Original comment by reingart@gmail.com on 25 May 2013 at 6:55

GoogleCodeExporter commented 9 years ago 
Hi there!

Thanks for the commit access, but I don't use Google Code enough, to be honest 
- all my stuff's been on Github for a while, and although I miss Mercurial 
sometimes, using two SCMs and merging two trees is something I really don't 
have time for.

I'd rather issue push requests to a Github mirror, if that's at all possible.

Original comment by rca...@gmail.com on 25 May 2013 at 8:57

GoogleCodeExporter commented 9 years ago 
Maybe you can use a plugin or bridge tool:

http://felipec.wordpress.com/2012/11/13/git-remote-hg-bzr-2/

http://hg-git.github.io/

Original comment by reingart@gmail.com on 25 May 2013 at 11:36

GoogleCodeExporter commented 9 years ago 
I am quite new at social coding but there is separated github repo 
(https://github.com/fuzeman/pysimplesoap) with few changes and looks like it's 
going further so i think we should create official github mirror (auto synced 
every ~12h) and new develop/features branch(es?) to avoid forking.

Original comment by oczk...@gmail.com on 26 May 2013 at 1:13

GoogleCodeExporter commented 9 years ago 
Hey, I'm currently the project owner of https://github.com/fuzeman/pysimplesoap

I'm assuming you mean 2-way sync between here and and the github repo, This 
isn't really something I've done before but can imagine it could be quite 
complex as we would need to ensure there isn't any conflicts or breaking 
changes on each sync.

If none of us want to budge we could just rename the github project and 
continue work independently but we could do googlecode -> github syncs, and 
someone here could pull our changes in as they want.

The problem (for me at least) is the GitHub workflow is what I use daily and I 
don't have the time to wrangle another SCM and project host.

If oczk...@gmail.com and rca...@gmail.com would like to do what I proposed we 
could discuss it further here https://github.com/fuzeman/pysimplesoap/pull/4

Original comment by fuzema...@gmail.com on 26 May 2013 at 5:42

GoogleCodeExporter commented 9 years ago 
One repo with two+ branches:
master/default - fully tested and accepted by reingart
develop - master branch + not completed fixes (without tests etc.)
feature/[name] - master/develop branch + new feature aka accepted pull request

It should be 2-way synced between github and googlecode so reingard can easily 
look at new features and accept/deny.

Maybe it's too complex solution but i just think that two separate packages 
isn't a good idea, especially when there is only few contributors.

Original comment by oczk...@gmail.com on 26 May 2013 at 12:36

GoogleCodeExporter commented 9 years ago 
Didn't notice hg-git can do 2-way sync how we are describing easily.

So, yea I'm fine with doing it this way.

Not sure what you were thinking of using to automate the syncing but
I could set it up on my build server that I already have running.

Original comment by fuzema...@gmail.com on 26 May 2013 at 1:26

GoogleCodeExporter commented 9 years ago 
fuzeman91: if you can set up the sync automatically, it would be great

I'd given commit access to you too, let me know if you need anything else

It would be a pity if this project splits or fork just for a SCM issue.
Agreeing and collaborating could take a bit more time of us at first, but I 
think it is the only way for the project to survive in the long term (at least 
in my humble experience).

BTW, I prefer the Apache's "lazy consensus" development process, so generally I 
don't do prior review or any other approval/voting process, and you're free to 
commit if you consider that your change is appropiate:

http://community.apache.org/committers/lazyConsensus.html

As said there, the repository is a "time machine" so any bad change could be 
reversed if any problem is found.

Also, we can discuss issues in the soap@python.org public mailing list (like 
the one in the pull request at github that you suggested)

Original comment by reingart@gmail.com on 26 May 2013 at 7:22

GoogleCodeExporter commented 9 years ago 
Later today I'll start working on getting the syncing working.

I just recently setup Travis CI (https://travis-ci.org/fuzeman/pysimplesoap) 
which should
help with ensuring branches and pull requests are working correctly before they 
are merged.

I forgot to ask, is everyone okay with having the github mirror under my 
account?
I would be happy to move it to an organization if not.

Also, Should we disable issues and wiki in github and just have links back to 
here?
I think it will get a bit confusing otherwise.

Original comment by fuzema...@gmail.com on 27 May 2013 at 4:11

GoogleCodeExporter commented 9 years ago 
Was quite busy so just got around to getting this sorted out.

hg-git was having some issues pulling in the github changes so I ended up just 
recreating the mirror at https://github.com/pysimplesoap/pysimplesoap and will 
just merge in changes from the old github repository into the new dev branch 
soon.

I'm not sure how you would of liked the dev branch to be made (bookmarks vs 
named branches) in mercurial, but it looks like hg-git only supports syncing 
between mercurial bookmarks and git branches. So as you should see a master and 
dev bookmark has been added now.

Original comment by fuzema...@gmail.com on 2 Jun 2013 at 12:18

GoogleCodeExporter commented 9 years ago 
Great work bro, let us know if you need any help with sync script or anything 
else.

Original comment by oczk...@gmail.com on 5 Jun 2013 at 11:03

GoogleCodeExporter commented 9 years ago 
Finally had some time to finish setting up automatic syncing, Currently it's 
setup
to sync at least once a day (no specific time, just whenever my build server 
isn't
under load). I could bump this interval up if needed.

Not quite sure how merges will work as the build server rejects doing them so it
can't mess anything up. Maybe we should just figure this out when we come to it?

Original comment by fuzema...@gmail.com on 16 Jun 2013 at 3:45