Show More
@@ -889,10 +889,10 b' def debugbuilddag(ui, repo, text,' | |||||
889 | """ |
|
889 | """ | |
890 |
|
890 | |||
891 | if not (mergeable_file or appended_file or overwritten_file or new_file): |
|
891 | if not (mergeable_file or appended_file or overwritten_file or new_file): | |
892 |
raise |
|
892 | raise util.Abort(_('need at least one of -m, -a, -o, -n')) | |
893 |
|
893 | |||
894 | if len(repo.changelog) > 0: |
|
894 | if len(repo.changelog) > 0: | |
895 |
raise |
|
895 | raise util.Abort(_('repository is not empty')) | |
896 |
|
896 | |||
897 | if overwritten_file or appended_file: |
|
897 | if overwritten_file or appended_file: | |
898 | # we don't want to fail in merges during buildup |
|
898 | # we don't want to fail in merges during buildup |
General Comments 0
You need to be logged in to leave comments.
Login now