Skip to content

Commit

Permalink
Merge pull request #102 from billsacks/explain_qmark
Browse files Browse the repository at this point in the history
Explain question mark

This is a minimal fix for #78

User interface changes?: No

Fixes: Partial fix for #78 (weird result when moving from subversion to git)

Testing:
test removed: none
unit tests: pass
system tests: pass
manual testing: triggered message, examined formatting
  • Loading branch information
billsacks committed May 7, 2018
2 parents 60fc03b + 7f973ae commit 9af6b02
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 1 deletion.
7 changes: 7 additions & 0 deletions manic/checkout.py
Original file line number Diff line number Diff line change
Expand Up @@ -359,6 +359,13 @@ def main(args):
(2) Alternatively, you do not have to rely on {program_name}. Instead, you
can manually update out-of-sync externals (labeled with 's' above)
as described in the configuration file {config_file}.
The external repositories labeled with '?' above are not under version
control using the expected protocol. If you are sure you want to switch
protocols, and you don't have any work you need to save from this
directory, then run "rm -rf [directory]" before re-running the
checkout_externals tool.
""".format(program_name=program_name, config_file=args.externals)

printlog('-' * 70)
Expand Down
3 changes: 2 additions & 1 deletion manic/repository_svn.py
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,8 @@ def xml_status_is_dirty(svn_output):
try:
xml_status = ET.fromstring(svn_output)
except BaseException:
fatal_error("SVN returned invalid XML message {}".format(svn_output))
fatal_error(
"SVN returned invalid XML message {}".format(svn_output))
xml_target = xml_status.find('./target')
entries = xml_target.findall('./entry')
for entry in entries:
Expand Down

0 comments on commit 9af6b02

Please sign in to comment.