Show More
@@ -1233,11 +1233,11 b' class localrepository(object):' | |||||
1233 | cctx = context.workingctx(self, text, user, date, extra, changes) |
|
1233 | cctx = context.workingctx(self, text, user, date, extra, changes) | |
1234 |
|
1234 | |||
1235 | if (not force and not extra.get("close") and not merge |
|
1235 | if (not force and not extra.get("close") and not merge | |
1236 | and not (changes[0] or changes[1] or changes[2]) |
|
1236 | and not cctx.files() | |
1237 | and wctx.branch() == wctx.p1().branch()): |
|
1237 | and wctx.branch() == wctx.p1().branch()): | |
1238 | return None |
|
1238 | return None | |
1239 |
|
1239 | |||
1240 |
if merge and c |
|
1240 | if merge and cctx.deleted(): | |
1241 | raise util.Abort(_("cannot commit merge with missing files")) |
|
1241 | raise util.Abort(_("cannot commit merge with missing files")) | |
1242 |
|
1242 | |||
1243 | ms = mergemod.mergestate(self) |
|
1243 | ms = mergemod.mergestate(self) |
General Comments 0
You need to be logged in to leave comments.
Login now