Version control
From CeltxWiki
| Revision as of 23:52, 14 June 2007 Jparris (Talk | contribs) wikifix ← Previous diff |
Revision as of 17:39, 30 September 2010 Armanius (Talk | contribs) Next diff → |
||
| Line 19: | Line 19: | ||
| :What if Writer #2 changes the order of a scene added by Writer #1, or changes the Scene Header, but otherwise leaves it as is, and meanwhile, Writer #1, working offline, makes edits to the their original Scene, not having synced to get Writer #2’s changes before they made their own changes? Ideally, Writer #1’s changes would merge with Writer #2 changes, there being no obvious conflict. | :What if Writer #2 changes the order of a scene added by Writer #1, or changes the Scene Header, but otherwise leaves it as is, and meanwhile, Writer #1, working offline, makes edits to the their original Scene, not having synced to get Writer #2’s changes before they made their own changes? Ideally, Writer #1’s changes would merge with Writer #2 changes, there being no obvious conflict. | ||
| :In any event, these are just two examples of how asynchronous online and offline editing can lead to complicated situations. And while it’s always possible to solve issues like this through brute force by introducing myriad rules to handle every identified instance of potential conflict or, alternatively, by kicking it back to the Users to resolve, we prefer instead to develop more elegant and intelligent solutions – one that are flexible, logical and understandable. | :In any event, these are just two examples of how asynchronous online and offline editing can lead to complicated situations. And while it’s always possible to solve issues like this through brute force by introducing myriad rules to handle every identified instance of potential conflict or, alternatively, by kicking it back to the Users to resolve, we prefer instead to develop more elegant and intelligent solutions – one that are flexible, logical and understandable. | ||
| + | |||
| + | ==External links== | ||
| + | [http://mackeeper.zeobit.com/recover-deleted-files-on-mac mac recover deleted files] | ||
| [[Category:Feature Suggestions]] | [[Category:Feature Suggestions]] | ||
Revision as of 17:39, 30 September 2010
Revision control (also known as version control, source control or (source) code management (SCM)) is the management of multiple revisions of the same unit of information. It is most commonly used in software development to manage ongoing development of digital documents like application source code, art resources such as blueprints or electronic models and other critical information that may be worked on by a team of people. Changes to these documents are identified by incrementing an associated number or letter code, termed the "revision number", "revision level", or simply "revision" and associated historically with the person making the change. A simple form of revision control, for example, has the initial issue of a drawing assigned the revision number "1". When the first change is made, the revision number is incremented to "2" and so on.
The Version Control which is most likely to be suited to Celtx would provide one of two services.
Diff or Merge.
- Diff is where differences in each version is cumulatively added as the project grows, this works well for a process that is growing in a linear manor.
- Merge is where changes are merged from various sources , potentially creating conflicts.
Diff
The present version control is a simplified Diff version control, where the diff is the entire project.
Merge
True Merge version control Is far more complex as shown by the following except from the celtx forum
- For instance, what if Writer #2 deletes a scene added by Writer #1, that before the delete a prop person, or someone in the art department, marked-up with some media, only to have Writer #1, on seeing the delete, add the scene back in? Ideally, the mark-up would also get added back in when the scene does, yes?
- What if Writer #2 changes the order of a scene added by Writer #1, or changes the Scene Header, but otherwise leaves it as is, and meanwhile, Writer #1, working offline, makes edits to the their original Scene, not having synced to get Writer #2’s changes before they made their own changes? Ideally, Writer #1’s changes would merge with Writer #2 changes, there being no obvious conflict.
- In any event, these are just two examples of how asynchronous online and offline editing can lead to complicated situations. And while it’s always possible to solve issues like this through brute force by introducing myriad rules to handle every identified instance of potential conflict or, alternatively, by kicking it back to the Users to resolve, we prefer instead to develop more elegant and intelligent solutions – one that are flexible, logical and understandable.
