Skip to content

Commit 2fd941a

Browse files
authored
Merge pull request #158 from billsacks/modified_solution
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
2 parents e954582 + de08dc2 commit 2fd941a

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

manic/checkout.py

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,7 @@ def main(args):
392392
# exit gracefully
393393
msg = """The external repositories labeled with 'M' above are not in a clean state.
394394
395-
The following are three options for how to proceed:
395+
The following are four options for how to proceed:
396396
397397
(1) Go into each external that is not in a clean state and issue either a 'git status' or
398398
an 'svn status' command (depending on whether the external is managed by git or
@@ -412,12 +412,17 @@ def main(args):
412412
{program_name}. Excluding externals labeled with 'M' will allow {program_name} to
413413
update the other, non-excluded externals.
414414
415+
(4) As a last resort, if you are confident that there is no work that needs to be saved
416+
from a given external, you can remove that external (via "rm -rf [directory]") and
417+
then rerun the {program_name} tool. This option is mainly useful as a workaround for
418+
issues with this tool (such as https://github.com/ESMCI/manage_externals/issues/157).
419+
415420
416421
The external repositories labeled with '?' above are not under version
417422
control using the expected protocol. If you are sure you want to switch
418423
protocols, and you don't have any work you need to save from this
419-
directory, then run "rm -rf [directory]" before re-running the
420-
checkout_externals tool.
424+
directory, then run "rm -rf [directory]" before rerunning the
425+
{program_name} tool.
421426
""".format(program_name=program_name, config_file=args.externals)
422427

423428
printlog('-' * 70)

0 commit comments

Comments
 (0)