summaryrefslogtreecommitdiff
path: root/tests.branching
Commit message (Expand)AuthorAgeFilesLines
...
* Preserve sort order of morphologies, so they can be edited by MorphSam Thursfield2012-09-102-51/+20
* morph merge: Complain if 'from' branch is not checked outSam Thursfield2012-09-102-0/+31
* morph branch: Fail if branch already exists in the system repoSam Thursfield2012-09-102-0/+40
* morph branch,checkout: Clean up the branch dir on failureSam Thursfield2012-09-104-0/+57
* tests.branching: Add test with strata outside the main morphs repoSam Thursfield2012-09-101-0/+149
* Rewrite 'merge' commandSam Thursfield2012-09-103-16/+19
* Add a new 'morph build' for building from a system branchJannis Pohlmann2012-09-072-2/+5
* Rewrite edit command to expect SYSTEM STRATUM [CHUNK] parametersJannis Pohlmann2012-09-0410-17/+40
* Merge branch 'jannis/find-repos-using-git-config-option'Sam Thursfield2012-09-034-0/+107
|\
| * Find branch root using the morph.repository option in .git/configJannis Pohlmann2012-09-032-0/+52
| * Remember the repo that is cloned from during branch/checkout/editJannis Pohlmann2012-08-312-0/+55
* | Use git config to store the branch root in .morph-system-branch/configJannis Pohlmann2012-08-316-18/+18
|/
* Rename 'minedir' to 'workspace' in testsSam Thursfield2012-08-305-0/+0
* Fix branch/checkout to always create branches in the workspace directoryJannis Pohlmann2012-08-305-1/+236
* Add "morph show-branch-root" commandJannis Pohlmann2012-08-306-0/+93
* Merge branch 'jannis/initial-branch-and-merge-work'Sam Thursfield2012-08-3040-163/+406
|\
| * Add mandatory repository parameter to "morph branch"Jannis Pohlmann2012-08-2914-43/+43
| * Remember repository that was branched off from for merging and editingJannis Pohlmann2012-08-299-9/+15
| * Make "morph checkout" require a repository parameterJannis Pohlmann2012-08-298-14/+114
| * Make "morph show-system-branch" anywhere in a workspace, if possibleJannis Pohlmann2012-08-2929-65/+197
| * Use .morph-system-branch directories to identify branch directoriesJannis Pohlmann2012-08-293-0/+3
| * Rename the "morph minedir" command to "morph workspace"Jannis Pohlmann2012-08-2922-46/+48
| * Create mine directory if it does not exists when running "morph init"Jannis Pohlmann2012-08-284-5/+5
* | Strata should be referred to with full repo/ref/morph tripletsSam Thursfield2012-08-302-4/+8
* | Strata contain "chunks", not "sources"Sam Thursfield2012-08-293-10/+11
|/
* Consolidate morphology writing code in pluginRichard Maw2012-08-011-1/+3
* Add test for petrifying strataRichard Maw2012-08-013-0/+56
* Refactor system building to use syskind specific classLars Wirzenius2012-07-261-1/+1
* Require system-kind on system morphologiesLars Wirzenius2012-07-191-0/+1
* Add check for missing build depends in strataLars Wirzenius2012-06-282-5/+9
* Fix test suite to deal with morph output changesLars Wirzenius2012-06-261-0/+1
* Allow "morph edit" to have a default ref to branch off fromLars Wirzenius2012-05-172-0/+35
* Add test case for "morph edit" updating strataLars Wirzenius2012-05-172-0/+54
* Fix filenames of test morphologiesLars Wirzenius2012-05-175-10/+10
* Use repo alias prefixes properly in testsLars Wirzenius2012-05-044-7/+7
* Set repo-alias with %s and use baserock: prefixLars Wirzenius2012-05-041-2/+2
* Make cmdtests set up repo-aliases and use prefixed reponamesLars Wirzenius2012-05-041-2/+3
* Make morph's _clone_to_directory use CachedRepo.checkoutLars Wirzenius2012-05-042-1/+4
* Add test for branching off not from masterLars Wirzenius2012-04-305-6/+69
* Add test script to test the whole branch+merge processLars Wirzenius2012-03-261-0/+39
* Change "checkout existing branch" test to not check out masterLars Wirzenius2012-03-265-14/+34
* Do not create a cache directory in the mineLars Wirzenius2012-03-263-3/+0
* Verify that "morph edit" checks out a working treeLars Wirzenius2012-03-232-0/+4
* Make "morph edit" work when chunk already has the branchLars Wirzenius2012-03-232-0/+41
* Modify "morph edit" test to verify origin is set correctlyLars Wirzenius2012-03-232-0/+30
* Add cmdtest for morph branch to set origin correctlyLars Wirzenius2012-03-232-0/+15
* Add "morph checkout" commandLars Wirzenius2012-03-232-0/+45
* Add "morph merge" subcommandLars Wirzenius2012-03-232-0/+49
* Add "morph edit", "morph show-system-branch" subcommandsLars Wirzenius2012-03-234-0/+74
* Implement "morph branch"Lars Wirzenius2012-03-222-0/+46