Show More
@@ -661,7 +661,7 b' class queue:' | |||
|
661 | 661 | m, a, r, d = repo.status(match=match)[:4] |
|
662 | 662 | else: |
|
663 | 663 | m, a, r, d = self.check_localchanges(repo, force) |
|
664 | match = cmdutil.match(repo, m + a + r) | |
|
664 | match = cmdutil.matchfiles(repo, m + a + r) | |
|
665 | 665 | commitfiles = m + a + r |
|
666 | 666 | self.check_toppatch(repo) |
|
667 | 667 | insert = self.full_series_end() |
@@ -44,4 +44,13 b' hg qnew first.patch' | |||
|
44 | 44 | touch ../first.patch |
|
45 | 45 | hg qimport ../first.patch |
|
46 | 46 | |
|
47 | exit 0 | |
|
47 | echo '% qnew -f from a subdirectory' | |
|
48 | hg qpop -a | |
|
49 | mkdir d | |
|
50 | cd d | |
|
51 | echo b > b | |
|
52 | hg ci -Am t | |
|
53 | echo b >> b | |
|
54 | hg st | |
|
55 | hg qnew -g -f p | |
|
56 | cat ../.hg/patches/p |
@@ -18,3 +18,13 b' foo bar' | |||
|
18 | 18 | % qnew twice |
|
19 | 19 | abort: patch "first.patch" already exists |
|
20 | 20 | abort: patch "first.patch" already exists |
|
21 | % qnew -f from a subdirectory | |
|
22 | Patch queue now empty | |
|
23 | adding d/b | |
|
24 | M d/b | |
|
25 | diff --git a/d/b b/d/b | |
|
26 | --- a/d/b | |
|
27 | +++ b/d/b | |
|
28 | @@ -1,1 +1,2 @@ | |
|
29 | b | |
|
30 | +b |
General Comments 0
You need to be logged in to leave comments.
Login now