summaryrefslogtreecommitdiff
path: root/tests.branching
Commit message (Expand)AuthorAgeFilesLines
...
| * Always use `git rev-parse --verify` to resolve refsSam Thursfield2012-12-131-2/+4
* | Fix bashism in morph tag test scriptsJannis Pohlmann2012-12-134-4/+4
* | Add an initial implementation of "morph tag"Jannis Pohlmann2012-12-139-0/+530
|/
* Tidy up command testsSam Thursfield2012-11-1442-97/+132
* Consolidate checks for python versionRichard Maw2012-11-135-27/+7
* Merge branch 'samthursfield/build-without-push' of git://git.baserock.org/bas...Richard Maw2012-11-126-11/+0
|\
| * Avoid caching repos that are on the local machine anywaySam Thursfield2012-11-126-11/+0
* | Merge branch 'samthursfield/test-tidying' of git://git.baserock.org/baserock/...Richard Maw2012-11-1255-207/+207
|\ \ | |/
| * tests: Use test: URL prefix instead of baserock: throughoutSam Thursfield2012-11-0755-207/+207
* | Fix spelling mistakesSam Thursfield2012-11-121-1/+1
|/
* Split merge tests out from the other branching testsSam Thursfield2012-10-2928-764/+3
* Simplify checkout-non-aliased-repos testRichard Maw2012-10-262-44/+2
* Merge branch 'samthursfield/morph-status-in-workspace-sorted'Sam Thursfield2012-10-181-1/+1
|\
| * morph status: Sort list of system branches in a workspaceSam Thursfield2012-10-181-1/+1
* | morph petrify: Avoid petrifying chunks that have already been editedSam Thursfield2012-10-184-5/+91
|/
* morph status: Add initial version of commandSam Thursfield2012-10-126-0/+106
* Merge remote-tracking branch 'origin/samthursfield/S4873-warn-when-merge-caus...Daniel Silverstone2012-10-114-1/+36
|\
| * Add test for petrify warningSam Thursfield2012-10-112-0/+33
| * morph merge: Warn if a merge will cause unexpected petrificationSam Thursfield2012-10-111-1/+1
| * Fix test that should have been doing 'morph edit'Sam Thursfield2012-10-111-0/+2
|/
* morph foreach: Handle repos addressed by full URLs correctlySam Thursfield2012-10-102-0/+30
* Handle submodules in 'morph edit'Sam Thursfield2012-10-032-0/+71
* Fix after reviewSam Thursfield2012-10-032-1/+1
* morph merge: Rework how we interact with gitSam Thursfield2012-10-036-24/+9
* Use origin/ref for all refs other than the system branch ref itselfSam Thursfield2012-10-031-0/+49
* Remove obsolete merging hack from merge conflict testSam Thursfield2012-09-271-12/+0
* morph merge: Use a special git merge driver for morphology filesSam Thursfield2012-09-273-5/+6
* Remove dead code from the end of testSam Thursfield2012-09-271-20/+1
* morph merge: Error message wranglingSam Thursfield2012-09-272-2/+2
* Fix merge tests on Squeeze, by disabling them correctlySam Thursfield2012-09-274-1/+18
* Add merge conflict testsSam Thursfield2012-09-258-0/+239
* Disable tests on Debian Squeeze that require Python 2.7Sam Thursfield2012-09-245-1/+28
* Test that 'petrify' is safe against multiple invocationsSam Thursfield2012-09-212-0/+54
* Add petrify/unpetrify workflow testSam Thursfield2012-09-214-112/+355
* Add 'morph unpetrify'Sam Thursfield2012-09-212-0/+21
* morph petrify: Rewrite in the style of todaySam Thursfield2012-09-212-3/+3
* morph foreach: Fix with cliapp < 1.20120630Sam Thursfield2012-09-211-1/+1
* Update branching tests to use 'morph foreach'Sam Thursfield2012-09-174-31/+27
* Add failure test for 'morph foreach'Sam Thursfield2012-09-174-0/+32
* tests.branching: Make workflow test to use system branches moreSam Thursfield2012-09-171-9/+39
* tests.branching: Add complex merge testsSam Thursfield2012-09-1711-0/+265
* morph merge: Don't make a merge commit if only the refs changedSam Thursfield2012-09-142-1/+3
* Update the stderr and stdout files for the tests.Daniel Silverstone2012-09-1410-21/+6
* Rework the blackbox tests for bare caches.Daniel Silverstone2012-09-147-11/+23
* Fix tests for previous commitSam Thursfield2012-09-132-2/+2
* Fix things so test suite works on Debian squeezeLars Wirzenius2012-09-133-1/+15
* tests: Always use fixed git committer infoSam Thursfield2012-09-131-12/+1
* Merge branch 'samthursfield/S4713-merge-message-for-chunks' of git://roadtrai...Richard Maw2012-09-132-0/+13
|\
| * morph merge: Give consistent commit message in chunk reposSam Thursfield2012-09-112-0/+13
* | Don't require .morph in triplet argumentsSam Thursfield2012-09-121-3/+2
|/
View Lorry Controller Status