summaryrefslogtreecommitdiff
path: root/tests.branching/edit-works-after-branch-root-was-renamed.stdout
Commit message (Collapse)AuthorAgeFilesLines
* tests: don't put cachedir in the workspaceRichard Maw2013-06-051-2/+0
| | | | | | This was a wild idea when we first designed the branch structure. It causes more problems than it's worth as you may have multiple workspaces, and it needed to be set manually in the first place.
* Avoid caching repos that are on the local machine anywaySam Thursfield2012-11-121-2/+0
| | | | | Currently the message is still displayed "Updating xxx" but no update is actually done.
* tests: Use test: URL prefix instead of baserock: throughoutSam Thursfield2012-11-071-3/+3
| | | | | | | | | | Some tests already used test: and in order to be able to share the scripts/setup-3rd-party-strata script they need to all use the same prefix. Using baserock: implies that we are using real code from Baserock, so I picked test: because the tests only ever use mock morphologies and no real code.
* Update the stderr and stdout files for the tests.Daniel Silverstone2012-09-141-2/+0
| | | | | | Rework the test outputs to match reality. This is due to tweaks in how morph edit/checkout gets its repository now that the copy-from-cache is marginally more like a traditional clone in terms of what you get at the end.
* Merge branch 'jannis/find-repos-using-git-config-option'Sam Thursfield2012-09-031-1/+1
| | | | | Conflicts: morphlib/plugins/branch_and_merge_plugin.py
* Find branch root using the morph.repository option in .git/configJannis Pohlmann2012-09-031-0/+18
This is more flexible than relying on the branch root repository directory to have the original name. The user might rename the branch root directory and we still want to be able to find it. Add a test that this new functionality works.