diff options
author | Richard Ipsum <richard.ipsum@codethink.co.uk> | 2013-11-11 16:35:16 +0000 |
---|---|---|
committer | Richard Ipsum <richard.ipsum@codethink.co.uk> | 2013-11-12 14:14:53 +0000 |
commit | 2cf5f0691241fa0e771cd7e7a8999961dc7250e8 (patch) | |
tree | baab911a37f1787a4fbaced885f8e8c7cd27aa16 /tests.branching/branch-fails-if-branch-exists.script | |
parent | c619991ffef6d98d20857953ec93292c69722eb9 (diff) | |
download | morph-richardipsum/s9532/fix_morph_edit_behaviour.tar.gz |
Use contents of working tree, regardless of which ref is checked outrichardipsum/s9532/fix_morph_edit_behaviour
morph edit loads stratum morphs from the morphs repository.
As a result a user can update a stratum morph and
have their changes overwritten by morph edit.
Even if the user commits their changes they will be
overwritten if the ref the user committed to does not
match the ref specified by the system morphology.
This commit modifies morph edit so that stratum morphs are
loaded from the user's file system rather than the morphs
repository.
If there is no stratum morph on the user's file system.
then the stratum morph is loaded from the morphs repository
Diffstat (limited to 'tests.branching/branch-fails-if-branch-exists.script')
0 files changed, 0 insertions, 0 deletions