Show More
@@ -1015,10 +1015,10 b' class queue:' | |||
|
1015 | 1015 | m = util.unique(mm) |
|
1016 | 1016 | r = util.unique(dd) |
|
1017 | 1017 | a = util.unique(aa) |
|
1018 |
|
|
|
1018 | c = [filter(matchfn, l) for l in (m, a, r, [], u)] | |
|
1019 | filelist = util.unique(c[0] + c[1] + c[2]) | |
|
1019 | 1020 | patch.diff(repo, patchparent, files=filelist, match=matchfn, |
|
1020 |
fp=patchf, changes= |
|
|
1021 | opts=self.diffopts()) | |
|
1021 | fp=patchf, changes=c, opts=self.diffopts()) | |
|
1022 | 1022 | patchf.close() |
|
1023 | 1023 | |
|
1024 | 1024 | repo.dirstate.setparents(*cparents) |
@@ -1066,7 +1066,8 b' class queue:' | |||
|
1066 | 1066 | message = msg |
|
1067 | 1067 | |
|
1068 | 1068 | self.strip(repo, top, update=False, backup='strip', wlock=wlock) |
|
1069 |
n = repo.commit(filelist, message, changes[1], |
|
|
1069 | n = repo.commit(filelist, message, changes[1], match=matchfn, | |
|
1070 | force=1, wlock=wlock) | |
|
1070 | 1071 | self.applied[-1] = statusentry(revlog.hex(n), patchfn) |
|
1071 | 1072 | self.applied_dirty = 1 |
|
1072 | 1073 | else: |
@@ -55,6 +55,18 b' sed -e "s/^\\(diff -r \\)\\([a-f0-9]* \\)/\\1' | |||
|
55 | 55 | -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ |
|
56 | 56 | -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" .hg/patches/test.patch |
|
57 | 57 | |
|
58 | echo % empty qrefresh | |
|
59 | ||
|
60 | hg qrefresh -X a | |
|
61 | echo 'revision:' | |
|
62 | hg diff -r -2 -r -1 | |
|
63 | echo 'patch:' | |
|
64 | cat .hg/patches/test.patch | |
|
65 | echo 'working dir diff:' | |
|
66 | hg diff --nodates -q | |
|
67 | # restore things | |
|
68 | hg qrefresh | |
|
69 | ||
|
58 | 70 | echo % qpop |
|
59 | 71 | |
|
60 | 72 | hg qpop |
General Comments 0
You need to be logged in to leave comments.
Login now