[20:37] <c7p> hello all, any author/editor available ?
[20:38] <godbyk> Hey, c7p. What's up?
[20:39] <c7p> nice, too busy these days but i'm trying to write some text for get involved pages
[20:39] <godbyk> I hear ya. I've been pretty swamped lately, too.
[20:40] <c7p> have you any free time now ?
[20:40] <godbyk> I can spare a few minutes.  How can I help?
[20:41] <c7p> well i'm trying to understand how an author does his job (no big deal i guess)
[20:42]  * c7p trying to find the text
[20:44] <c7p> godbyk: ok here we are, http://typewith.me/Gi3quUoar8
[20:45] <c7p> in this section i tell the reader how to pull and push the content of a branch through Ground Control
[20:45] <godbyk> 'kay
[20:46] <c7p> i talked with Alexander before some days and he said that as an author he uses the push, pull, branch and merge commands
[20:47] <godbyk> Right.
[20:47] <godbyk> I think the basic order that I use it:
[20:47] <godbyk> 1. bzr pull to ensure I have the latest changes from upstream.
[20:47] <godbyk> 2. Make my edits.
[20:47] <godbyk> 3. bzr pull to grab any changes that happened while I was editing.
[20:48] <godbyk> 4. bzr commit to commit my changes locally.
[20:48] <godbyk> 5. bzr push to push the changes to the server.
[20:48] <godbyk> 6. go to step 1.
[20:48] <c7p> neat
[20:49] <c7p> if you are editing a file that has been updated there is confict when you are trying to commit the changes right ?
[20:51] <godbyk> you won't notice the conflict until you try to push the changes.
[20:51] <godbyk> bzr commit just commits it locally on your computer.
[20:51] <godbyk> bzr push tries to upload the changes to the server.
[20:52] <godbyk> when there's a flurry of activity and lots of people are editing, committing, and pushing at the same time, we sometimes add some extra steps.
[20:52] <godbyk> so between step 4 and 5 we might do a pull.
[20:53] <c7p> ah ok
[20:53] <godbyk> if there are conflicts at that point, you can run 'bzr uncommit' to uncommit your changes, then bzr pull to merge the upstream changes with your local stuff.  then bzr commit to commit your stuff again. and finally bzr push to upload to the server.
[20:54] <c7p> i guess the merge doesn't mean loss of work
[20:55] <godbyk> well, there's merging that happens when you run bzr pull.
[20:55] <godbyk> (the upstream changes are merged into your local stuff)
[20:56] <godbyk> but since we're not creating lots of branches, we don't typically have to call bzr merge to merge together two branches.
[20:56] <c7p> aha ok i think i understand it better now
[20:57] <c7p> so let's recap :P, i'm an author
[20:58] <godbyk> 'kay.
[20:58] <c7p> i work with my tex files, on local branch. Before i start writing stuff i'm pulling the lattest changes/updates and then i'm "ready" to start writing
[20:59] <godbyk> yep
[21:00] <c7p> let's say i have finished my work for today, (i pull again the changes if there are any ?) and then i push the changes
[21:00] <c7p> *on of the files i've been workin on
[21:00] <godbyk> you pull any changes, then you commit your changes, then you push your changes.
[21:01] <c7p> ok :)
[21:03] <c7p> ah
[21:04] <c7p> the files of the branch are named and placed by you ?
[21:04] <c7p> let's say for the 11.04's manual
[21:04] <godbyk> I'm not sure I understand the question.
[21:04] <godbyk> 'kay..
[21:04] <c7p> sorry
[21:06] <c7p> an author wants to start working, are you creating the tex files (e.g for Chapter 4) and you tell him these are the files that you will work on mostly ? or the author has to create the files by himself/herself ?
[21:07] <c7p> was i clear :/ ?
[21:07] <godbyk> ah, I understand now.
[21:07] <godbyk> we usually set up the main chapter file.
[21:08] <godbyk> So let's say you had a chapter titled "A Walk Through the Park"
[21:08] <godbyk> we'd create a directory (e.g., 'walk-through-park') and a file (walk-through-park.tex).
[21:08] <godbyk> we edit the main.tex file and add \include{walk-through-park/walk-through-park}.
[21:09] <godbyk> as an author, you can edit the walk-through-park.tex file.
[21:09] <godbyk> you can either include all of your sections in that one file, or
[21:09] <godbyk> if you choose, you can split your sections up into multiple files.
[21:09] <godbyk> place all the files in the directory for that chapter (walk-through-park/)
[21:09] <c7p> now it gets even clearer thx
[21:09] <godbyk> then in your walk-through-park.tex file, you can add the line \input{first-section}, \input{second-section}, etc.
[21:10] <godbyk> and that will read in the first-section.tex, second-section.tex, etc. files located in the walk-through-park/ directory.
[21:10] <c7p> latex is cool :P
[21:10] <godbyk> :)