Show More
@@ -883,13 +883,12 b' class localrepository(repo.repository):' | |||||
883 | if branchname: |
|
883 | if branchname: | |
884 | extra["branch"] = branchname |
|
884 | extra["branch"] = branchname | |
885 |
|
885 | |||
886 | if use_dirstate: |
|
886 | lines = [line.rstrip() for line in text.rstrip().splitlines()] | |
887 | lines = [line.rstrip() for line in text.rstrip().splitlines()] |
|
887 | while lines and not lines[0]: | |
888 |
|
|
888 | del lines[0] | |
889 | del lines[0] |
|
889 | if not lines and use_dirstate: | |
890 | if not lines: |
|
890 | raise util.Abort(_("empty commit message")) | |
891 | raise util.Abort(_("empty commit message")) |
|
891 | text = '\n'.join(lines) | |
892 | text = '\n'.join(lines) |
|
|||
893 |
|
892 | |||
894 | n = self.changelog.add(mn, changed + removed, text, trp, p1, p2, |
|
893 | n = self.changelog.add(mn, changed + removed, text, trp, p1, p2, | |
895 | user, date, extra) |
|
894 | user, date, extra) |
@@ -10,10 +10,10 b' 3 t3' | |||||
10 | 2 t4.1 |
|
10 | 2 t4.1 | |
11 | 1 t4.2 |
|
11 | 1 t4.2 | |
12 | 0 Merge branch other |
|
12 | 0 Merge branch other | |
13 | changeset: 5:c6d72c98aa00 |
|
13 | changeset: 5:4ab1af49a271 | |
14 | tag: tip |
|
14 | tag: tip | |
15 |
parent: 3: |
|
15 | parent: 3:0222ab0998d7 | |
16 |
parent: 4: |
|
16 | parent: 4:5333c870e3c2 | |
17 | user: test <test@example.org> |
|
17 | user: test <test@example.org> | |
18 | date: Mon Jan 01 00:00:15 2007 +0000 |
|
18 | date: Mon Jan 01 00:00:15 2007 +0000 | |
19 | files: a |
|
19 | files: a |
General Comments 0
You need to be logged in to leave comments.
Login now