From ae8c422afa145ebea7a0a95070a812ad44980924 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergio=20Baldov=C3=AD?= Date: Sun, 3 Jul 2016 10:30:21 +0200 Subject: [PATCH] Fix typos in 'add' command. --- reposurgeon | 6 +++--- reposurgeon.xml | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/reposurgeon b/reposurgeon index 97b365349..510c795ef 100755 --- a/reposurgeon +++ b/reposurgeon @@ -10281,13 +10281,13 @@ in the commit's ancestry. except ValueError: raise Recoverable("non-numeric mark %s in add command" % mark) if not isinstance(repo.objfind(mark), Blob): - raise Recoverable("mark %s in add command does not refer to a blo" % mark) + raise Recoverable("mark %s in add command does not refer to a blob" % mark) elif markval >= min(self.selection): raise Recoverable("mark %s in add command is after add location" % mark) path = fields[3] for _, event in self.selected(Commit): if path in event.paths(): - raise Recoverable("%s already has on op for %s" \ + raise Recoverable("%s already has an op for %s" \ % (event.mark, path)) elif optype in ("R", "C"): try: @@ -10297,7 +10297,7 @@ in the commit's ancestry. raise Recoverable("too few arguments in add %s" % optype) for _, event in self.selected(Commit): if source in event.paths() or target in event.paths(): - raise Recoverable("%s already has on op for %s or %s" \ + raise Recoverable("%s already has an op for %s or %s" \ % (event.mark, source, target)) if repo.ancestor_count(event, source) == 0: raise Recoverable("no previous M for %s" % source) diff --git a/reposurgeon.xml b/reposurgeon.xml index b53d184af..26bc8bb90 100644 --- a/reposurgeon.xml +++ b/reposurgeon.xml @@ -1327,6 +1327,7 @@ of file operations in the original commit. mark path | R source target + | C source target} -- GitLab