diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2012-09-13 19:20:45 +0100 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2012-09-14 19:44:40 +0100 |
| commit | 3911c0bea5654a4de7cd9121d89c7f9bc69b0172 (patch) | |
| tree | 5d21210156899e1317f8a4242d1ca264ae0f9650 /morphlib | |
| parent | f7a3f591a12baa17fa0380ba36405651fe2b0126 (diff) | |
| download | morph-3911c0bea5654a4de7cd9121d89c7f9bc69b0172.tar.gz | |
morph merge: Give full dir instead of repo name in merge errors
There are two copies of each repo involved at this point so we must
be clear about which one has an error.
Diffstat (limited to 'morphlib')
| -rw-r--r-- | morphlib/plugins/branch_and_merge_plugin.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/morphlib/plugins/branch_and_merge_plugin.py b/morphlib/plugins/branch_and_merge_plugin.py index 4f78551e..c81c95c8 100644 --- a/morphlib/plugins/branch_and_merge_plugin.py +++ b/morphlib/plugins/branch_and_merge_plugin.py @@ -617,7 +617,7 @@ class BranchAndMergePlugin(cliapp.Plugin): if self.get_uncommitted_changes(from_dir) != []: raise cliapp.AppException('repository %s has uncommitted ' - 'changes' % name) + 'changes' % from_dir) # repo must be made into a URL to avoid ':' in pathnames confusing git from_url = urlparse.urljoin('file://', from_dir) self.app.runcmd(['git', 'pull', '--no-commit', '--no-ff', from_url, |