Show More
@@ -471,7 +471,7 b' class queue:' | |||||
471 | # the first patch in the queue is never a merge patch |
|
471 | # the first patch in the queue is never a merge patch | |
472 | # |
|
472 | # | |
473 | pname = ".hg.patches.merge.marker" |
|
473 | pname = ".hg.patches.merge.marker" | |
474 |
n = repo.commit(None, '[mq]: merge marker', |
|
474 | n = repo.commit(None, '[mq]: merge marker', force=1) | |
475 | self.removeundo(repo) |
|
475 | self.removeundo(repo) | |
476 | self.applied.append(statusentry(hex(n), pname)) |
|
476 | self.applied.append(statusentry(hex(n), pname)) | |
477 | self.applied_dirty = 1 |
|
477 | self.applied_dirty = 1 | |
@@ -597,7 +597,7 b' class queue:' | |||||
597 |
|
597 | |||
598 | files = patch.updatedir(self.ui, repo, files) |
|
598 | files = patch.updatedir(self.ui, repo, files) | |
599 | match = cmdutil.matchfiles(repo, files or []) |
|
599 | match = cmdutil.matchfiles(repo, files or []) | |
600 |
n = repo.commit( |
|
600 | n = repo.commit(None, message, ph.user, ph.date, match=match, | |
601 | force=True) |
|
601 | force=True) | |
602 |
|
602 | |||
603 | if n is None: |
|
603 | if n is None: | |
@@ -763,7 +763,7 b' class queue:' | |||||
763 | if hasattr(msg, '__call__'): |
|
763 | if hasattr(msg, '__call__'): | |
764 | msg = msg() |
|
764 | msg = msg() | |
765 | commitmsg = msg and msg or ("[mq]: %s" % patchfn) |
|
765 | commitmsg = msg and msg or ("[mq]: %s" % patchfn) | |
766 |
n = repo.commit( |
|
766 | n = repo.commit(None, commitmsg, user, date, match=match, force=True) | |
767 | if n is None: |
|
767 | if n is None: | |
768 | raise util.Abort(_("repo commit failed")) |
|
768 | raise util.Abort(_("repo commit failed")) | |
769 | try: |
|
769 | try: | |
@@ -1284,7 +1284,7 b' class queue:' | |||||
1284 | try: |
|
1284 | try: | |
1285 | # might be nice to attempt to roll back strip after this |
|
1285 | # might be nice to attempt to roll back strip after this | |
1286 | patchf.rename() |
|
1286 | patchf.rename() | |
1287 |
n = repo.commit( |
|
1287 | n = repo.commit(None, message, user, ph.date, | |
1288 | match=match, force=1) |
|
1288 | match=match, force=1) | |
1289 | self.applied.append(statusentry(hex(n), patchfn)) |
|
1289 | self.applied.append(statusentry(hex(n), patchfn)) | |
1290 | except: |
|
1290 | except: | |
@@ -1470,7 +1470,7 b' class queue:' | |||||
1470 | msg += "\n\nPatch Data:\n" |
|
1470 | msg += "\n\nPatch Data:\n" | |
1471 | text = msg + "\n".join([str(x) for x in self.applied]) + '\n' + (ar and |
|
1471 | text = msg + "\n".join([str(x) for x in self.applied]) + '\n' + (ar and | |
1472 | "\n".join(ar) + '\n' or "") |
|
1472 | "\n".join(ar) + '\n' or "") | |
1473 |
n = repo.commit(None, text, |
|
1473 | n = repo.commit(None, text, force=1) | |
1474 | if not n: |
|
1474 | if not n: | |
1475 | self.ui.warn(_("repo commit failed\n")) |
|
1475 | self.ui.warn(_("repo commit failed\n")) | |
1476 | return 1 |
|
1476 | return 1 |
@@ -33,7 +33,6 b" unable to find 'b' for patching" | |||||
33 | 1 out of 1 hunks FAILED -- saving rejects to file b.rej |
|
33 | 1 out of 1 hunks FAILED -- saving rejects to file b.rej | |
34 | patch failed, unable to continue (try -v) |
|
34 | patch failed, unable to continue (try -v) | |
35 | b: No such file or directory |
|
35 | b: No such file or directory | |
36 | b not tracked! |
|
|||
37 | patch failed, rejects left in working dir |
|
36 | patch failed, rejects left in working dir | |
38 | errors during apply, please fix and refresh changeb |
|
37 | errors during apply, please fix and refresh changeb | |
39 | ? b.rej |
|
38 | ? b.rej |
General Comments 0
You need to be logged in to leave comments.
Login now