Quote:
Originally Posted by kovidgoyal
calibre's source control system has moved from bzr to git, see the sticky post in the development section.
|
And what a PITA that has been, for me at least. None of my workflow survived, and I find GIT branching and upstream repository handling strange. But so be it ...
I found that tool SmartGit/HG helped me a lot with this transition. It is free for non-commercial use. It presents the log in a very readable threaded form, has full-file presentations of changes, presents uncommitted changes clearly, makes reversions easy, and lets you easily select what "upstream repository" to use for a given operation. My secret for happiness was discovering that if I "pull" from Kovid's master, "merge" the pulled records to my local repo, and then "sync" with my own upstream repo, then that repo is in good shape for submitting the necessary "pull request". You do the "pull request" by going to github, signing in, clicking on your upstream repo, clicking "pull requests" on the right, then clicking the green "new pull request" button.