Le jeudi 14 novembre 2013 17:53:57 UTC+1, anatoly techtonik a écrit : > On Thursday, November 14, 2013 11:29:47 AM UTC+3, Joseph Martinot-Lagarde > wrote: >> >> Well it's a matter of taste, I don't like google code interface at all. >> Wiki pages is a minor inconvenient (if any) compared to the usability of >> pull requests. >> > > What is the workflow you need from pull requests? > Well, pull requests are linked to the branch concept : create a branch, add commits, and open a pull request pointing to this branch. Anythong you do in the branch afterwards will be included in the pull request. Once the code is OK, it is merged in the main branch. The big advantage is that averything is done from the VCS. People can pull the branch to test the code, follow the corrections by updating it, add comments to specific lines of the code, ad so on...
Compare this to https://code.google.com/p/spyderlib/wiki/NoteForContributors#Sharing_changes, where you basically send patches by mail. For me the biggest problem in distributed project is still the properly > illustrated branching strategy. I remember I've seen an extensive manual > about proper Git process, but couldn't finish it due to the lack of serious > branching experience. I am not saying that Mercurial doesn't need one. It > is just the domain that is usually hard to cover in Git vs Mercurial > comparisons. > Funny, I found branches in git easier than in mercurial. But I admit that I didn't try very hard, There is also the possibility to have read/write mirror I guess, but I have >>>> no clue of how it works... >>>> >>> >>> Pull from Bitbucket, commit to Google Code, and it is synced around. No >>> read/write mirror is possible without auto merges. >>> >> > Updates: the official Bitbucket mirror is here - > https://bitbucket.org/rirror/spyder > (well, I took a freedom to mark it official as it is the only one that is > open for suggestions) > It is automatically updated at "45 * * * *" - every hour? > > Feel free to stack pull requests there and report what is bad about the > process. > > >> 2-stage commits really suxx. Use `hg record` if you're unsure about what >>> you're committing. >>> >> >> It sux for you maybe, but it is very logical to me to first choose the >> modifications you want to commit, then validate the commit. It fits my >> workflow very well. Thanks for `hg record`, it seems to be a direct >> equivalent. >> > > My workflow opens colored 'hg diff' in one pane and editor launched by 'hg > ci' in another. Commit message template already contains list of all > modified files, and diff on the left pane allows me to quickly review files > I am not sure about. I find it very annoying in Git that if you caught > omission after adding to staging area, you need to review diff in staged > files with different command, and to revert the file addition with other > command that is for other purpose. Enforced 2-step process in Git is > absolutely not necessary - I never felt uncomfortable in SVN, HG or Bazaar > because of that. Quite the opposite - I move work on unrelated changes into > mercurial queue (like stash, but every MQ is a commit), so when I commit, > it is always one change. > Well, using git gui you basically get the same setup : you have a list of modified files that you can select (or select parts of them), you see the diffs of the files in another panel. You write your commit and validate. It is equivalent here. > > >> + easy selection line by line or block by block instead of whole files >>>> for commits (using git gui) >>>> >>> >>> 'hg record', no GUI required. >>> >> >> GUI is not required, it just makes it easier. I usually prefer a good gui >> to any command line. (Sadly good gui is not that common.) >> > > Oh, you will like http://code.google.com/p/tortoisehg/ then. It is > adorable. =) > I heard about it, I'll have the joy to use it with spyder ! I'm defending git here but I want to make clear that it is not for switching spyder to git. I initially started with mercurial and I'd still use it if it wasn't for github. Those people really make great software. -- You received this message because you are subscribed to the Google Groups "spyder" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To post to this group, send email to [email protected]. Visit this group at http://groups.google.com/group/spyderlib. For more options, visit https://groups.google.com/groups/opt_out.
