diff options
| author | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2012-11-02 15:38:10 +0000 |
|---|---|---|
| committer | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2012-11-02 15:38:10 +0000 |
| commit | 163f9dc6e5424122ee218c4ef6009274831210ca (patch) | |
| tree | 865ed59f02572e49961507d8315f6578a11ac9c9 | |
| parent | 3e073d8552f04933e7d70b177c263c2a893f98f9 (diff) | |
| parent | d7424a866d7662facf3768750fcd29db8f6315a9 (diff) | |
| download | definitions-163f9dc6e5424122ee218c4ef6009274831210ca.tar.gz | |
Merge remote-tracking branch 'origin/samthursfield/fix-load-morphology-bug'
| -rw-r--r-- | morphlib/plugins/branch_and_merge_plugin.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/morphlib/plugins/branch_and_merge_plugin.py b/morphlib/plugins/branch_and_merge_plugin.py index 1646356d..f0cbea81 100644 --- a/morphlib/plugins/branch_and_merge_plugin.py +++ b/morphlib/plugins/branch_and_merge_plugin.py @@ -275,6 +275,7 @@ class BranchAndMergePlugin(cliapp.Plugin): with open(filename) as f: text = f.read() else: + filename = '%s.morph at ref %s in %s' % (name, ref, repo_dir) if not morphlib.git.is_valid_sha1(ref): ref = morphlib.git.rev_parse(self.app.runcmd, repo_dir, ref) try: |