On 01/14/2014 11:00 AM, Beman Dawes wrote:
On Mon, Jan 13, 2014 at 12:36 PM, Peter A. Bigot
wrote: On 01/13/2014 06:28 AM, Gennadiy Rozental wrote:
Peter A. Bigot
writes: Below is an annotated sequence of (bash) command-line git operations
that I used in a local copy of Boost.Test to understand what was happening in it, with no intention of proposing this be what the maintainers actually do with the module.
Thank you. I need to get my hands dirty and finally switch to git locally. At some point I'll need this (I hope ;))
In the interests of reducing pain: I recommend against using those steps.
The problem, of course, is that your procedure is overwhelmingly complex for a new git user. That's why the docs we've been working on try to stick to very basic git.
True. The problem with the docs is that they don't explain what the commands are doing and why (or why not) use them. Rote application works until something goes wrong, then people get confused about what happened. (Recall that the original email was roughly contemporaneous with, and motivated by, issues a maintainer had following https://svn.boost.org/trac/boost/wiki/PostCvtMergePoint in multi_index.) The sole value, if any, in what I wrote was that it does try to make clear the goals of each step, and to introduce the underlying git concepts and process trade-offs that influence the decision of how to react to the situations that are presented when you follow them. It's an opportunity to engage in a learning exercise.
Since Gennadiy hasn't even begun to use git, he might be better off starting with https://svn.boost.org/trac/boost/wiki/ModularBoost
Agreed. Peter