Skip to content

Commit

Permalink
Merge pull request #158 from billsacks/modified_solution
Browse files Browse the repository at this point in the history
Add another option for when an external is in a modified state

Add another option for when an external is in a modified state

Inspired by #157 and how I've been working around it.

User interface changes?: No

Fixes: None

Testing:
test removed: none
unit tests: pass
system tests: pass
manual testing: examined output
  • Loading branch information
billsacks authored Apr 21, 2021
2 parents e954582 + de08dc2 commit 2fd941a
Showing 1 changed file with 8 additions and 3 deletions.
11 changes: 8 additions & 3 deletions manic/checkout.py
Original file line number Diff line number Diff line change
Expand Up @@ -392,7 +392,7 @@ def main(args):
# exit gracefully
msg = """The external repositories labeled with 'M' above are not in a clean state.
The following are three options for how to proceed:
The following are four options for how to proceed:
(1) Go into each external that is not in a clean state and issue either a 'git status' or
an 'svn status' command (depending on whether the external is managed by git or
Expand All @@ -412,12 +412,17 @@ def main(args):
{program_name}. Excluding externals labeled with 'M' will allow {program_name} to
update the other, non-excluded externals.
(4) As a last resort, if you are confident that there is no work that needs to be saved
from a given external, you can remove that external (via "rm -rf [directory]") and
then rerun the {program_name} tool. This option is mainly useful as a workaround for
issues with this tool (such as https://github.com/ESMCI/manage_externals/issues/157).
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.
directory, then run "rm -rf [directory]" before rerunning the
{program_name} tool.
""".format(program_name=program_name, config_file=args.externals)

printlog('-' * 70)
Expand Down

0 comments on commit 2fd941a

Please sign in to comment.