On Apr 22, 2:43 pm, "Edward K. Ream" <[EMAIL PROTECTED]> wrote:
> I'll review the workflow I use later. In general, my goal is to reduce the > possibilities for error whenever possible, and I'll discuss how I do this. Here are some tips related to my workflow: 1. I use batch files to reduce typing to the safe minimum. The following batch files take me to the corresponding branches/ directories: repo, trunk, sax-graph, etc. Nowadays, I open all files from a console, so the XP and Linux workflows are almost identical. I use a batch file called 'b' that simply does bzr. I define bzr alias for status (s), merge (m), info (i) etc. So I type 'b s' rather than 'bzr st'. I do *not* define an abbreviation for 'push': if I want to push a branch, I must type 'b push'. 2. I always use 'bzr branch' to create new branches, and I put all branches under a leo.repo folder: repo (same as cd repo) bzr branch <url of the branch on launchpad) 3. I use 'bzr merge', never bzr pull. If I want a clean branch, I'll delete the dubious branch, then do step 2 again. 4. I only use 'bzr push' with no url. That is, I only used remembered url's when pushing. Before pushing, I commit all modified files so that 'b s' reports nothing. Oh yes, 'b up' is a bzr alias for: bzr c -m "update aux files" I do 'b up' to commit all remaining "uninteresting" files just before pushing. 5. Before doing a merge, I make sure 'b s' reports nothing. If there are problems with the merge, 'b revert' will undo the merge. That's about it. With these "usage conventions" in place it is difficult to make serious mistakes. About the only confusion that can happen is having two copies of leoPy.leo open in different branches, then editing the wrong copy. To combat this, keep two copies open as little as possible. HTH. Edward --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "leo-editor" group. To post to this group, send email to [email protected] To unsubscribe from this group, send email to [EMAIL PROTECTED] For more options, visit this group at http://groups.google.com/group/leo-editor?hl=en -~----------~----~----~----~------~----~------~--~---
