On Sun, Jul 11, 2010 at 12:22 PM, Daniel Carrera <[email protected]> wrote:
> <snip> > > About the "Get Started" page: Give me some time to think about what > you wrote. I see things differently from you, but rather than start an > argument, I'll try to find something that we'll both find > satisfactory. That said, some comments: > > * I think your Honda analogy makes no sense. We are not a dealership > selling Git. We are "selling" PDL and Git is a tool we use. > > * Technically there is no need for us to write Git documentation > either. Git already comes with manuals that are perfectly suitable. I > wrote the documentation in part because I like writing documentation > and I like being thorough. And yes, I do have a personal motivation to > encourage non-Git users. I think very highly of Bazaar, Mercurial, > Monotone and Darcs. They have much to offer and I want to invite users > who prefer one of those SCMs. Please allow me to scratch a personal > itch. That's part of what makes open source projects work well. As I > said, I will make an effort to make a page that we'll both find > satisfactory. > For my part, I vote to let Daniel keep the Git/Mercurial side-by-side. I don't think it's confusing and it make Daniel and other mercurial fans happy. The only issues will arise if we ever start making fancy hooks for our git repo, at which point I will leave it up the mercurial fans to figure out how to make sure things work. @Daniel: A note about pushing local branches to and pulling branches from the server. Whether or not you set-up tracking (with the configuration commands), you still need to call push and pull from that branch. Also, the command you suggest will depend upon what the person means to do. Here is an example that is too long for the web site write-up, but will hopefully clarify what you need to do with git for each of these cases: ----%<---- # clone and track somebody else's work: git branch --track my-copy origin/their-feature # when working in the my-copy branch, pushing and pulling will do what you mean # push your work to the sourceforge server git push origin my-feature # pull others' contribution to your work from sourceforge: git fetch origin # then from my-feature branch: git merge origin/my-feature # You'll want to tell your local repo to automatically track # changes to the remote branch with your local branch. # Then pushing and pulling will automatically update: pdl config ... pdl config ... ---->%---- Git's default behavior let's you create your own local branches without pushing them to the server unless you explicitly tell it to do so. It seems to me that this is one of many examples in which mercurial leans towards behavior that makes sense for smaller projects whereas git leans towards behavior that makes sense for larger projects. David -- Sent via my carrier pigeon.
_______________________________________________ Perldl mailing list [email protected] http://mailman.jach.hawaii.edu/mailman/listinfo/perldl
