Show More
@@ -798,7 +798,7 def createchangeset(ui, log, fuzz=60, me | |||||
798 | except KeyError: |
|
798 | except KeyError: | |
799 | ui.warn(_("warning: CVS commit message references " |
|
799 | ui.warn(_("warning: CVS commit message references " | |
800 | "non-existent branch %r:\n%s\n") |
|
800 | "non-existent branch %r:\n%s\n") | |
801 | % (m, c.comment)) |
|
801 | % (pycompat.bytestr(m), c.comment)) | |
802 | if m in branches and c.branch != m and not candidate.synthetic: |
|
802 | if m in branches and c.branch != m and not candidate.synthetic: | |
803 | c.parents.append(candidate) |
|
803 | c.parents.append(candidate) | |
804 |
|
804 |
General Comments 0
You need to be logged in to leave comments.
Login now