StateDescriptions » History » Version 1
Chris Cannam, 2010-11-26 09:10 AM
| 1 | 1 | Chris Cannam | h1. How to summarise the current working folder state |
|---|---|---|---|
| 2 | 1 | Chris Cannam | |
| 3 | 1 | Chris Cannam | We want a one-sentence description of the current state. This needs to give an indication of what the "parent revisions" are, i.e. whereabouts on the graph we are -- it isn't intended to summarise what changes we've made in the working copy (that's the job of the rest of the Work pane). |
| 4 | 1 | Chris Cannam | |
| 5 | 1 | Chris Cannam | Some possibly promising formulations: |
| 6 | 1 | Chris Cannam | |
| 7 | 1 | Chris Cannam | h3. For the "normal" case (everything up-to-date) |
| 8 | 1 | Chris Cannam | |
| 9 | 1 | Chris Cannam | *State:* At the head of the default branch |
| 10 | 1 | Chris Cannam | |
| 11 | 1 | Chris Cannam | h3. Others |
| 12 | 1 | Chris Cannam | |
| 13 | 1 | Chris Cannam | [head of a non-default branch] |
| 14 | 1 | Chris Cannam | |
| 15 | 1 | Chris Cannam | *State:* At the head of branch "blah" |
| 16 | 1 | Chris Cannam | |
| 17 | 1 | Chris Cannam | [two parents] |
| 18 | 1 | Chris Cannam | |
| 19 | 1 | Chris Cannam | *State:* Merged but not committed |
| 20 | 1 | Chris Cannam | |
| 21 | 1 | Chris Cannam | [somewhere on a branch that is not a head] |
| 22 | 1 | Chris Cannam | |
| 23 | 1 | Chris Cannam | *State:* On the default branch; newer revisions are available (consider using Update) |
| 24 | 1 | Chris Cannam | |
| 25 | 1 | Chris Cannam | *State:* On branch "blah"; newer revisions are available on this branch |
| 26 | 1 | Chris Cannam | |
| 27 | 1 | Chris Cannam | Hm, doesn't really work because the other revisions are not necessarily newer (they may be contemporary) |