Show More
@@ -1511,9 +1511,11 b' class queue:' | |||||
1511 | checkfile(patchname) |
|
1511 | checkfile(patchname) | |
1512 | patchf = self.opener(patchname, "w") |
|
1512 | patchf = self.opener(patchname, "w") | |
1513 | patchf.write(text) |
|
1513 | patchf.write(text) | |
1514 | checkseries(patchname) |
|
1514 | if not force: | |
1515 | index = self.full_series_end() + i |
|
1515 | checkseries(patchname) | |
1516 | self.full_series[index:index] = [patchname] |
|
1516 | if patchname not in self.series: | |
|
1517 | index = self.full_series_end() + i | |||
|
1518 | self.full_series[index:index] = [patchname] | |||
1517 | self.parse_series() |
|
1519 | self.parse_series() | |
1518 | self.ui.warn("adding %s to series file\n" % patchname) |
|
1520 | self.ui.warn("adding %s to series file\n" % patchname) | |
1519 | i += 1 |
|
1521 | i += 1 |
@@ -36,6 +36,22 b' rm foo' | |||||
36 | hg qimport file://$HGTMP/url.diff |
|
36 | hg qimport file://$HGTMP/url.diff | |
37 | hg qun |
|
37 | hg qun | |
38 |
|
38 | |||
|
39 | echo % import patch that already exists | |||
|
40 | echo foo2 >> foo | |||
|
41 | hg add foo | |||
|
42 | hg diff > ../url.diff | |||
|
43 | hg revert --no-backup foo | |||
|
44 | rm foo | |||
|
45 | hg qimport ../url.diff | |||
|
46 | hg qpush | |||
|
47 | cat foo | |||
|
48 | hg qpop | |||
|
49 | echo % qimport -f | |||
|
50 | hg qimport -f ../url.diff | |||
|
51 | hg qpush | |||
|
52 | cat foo | |||
|
53 | hg qpop | |||
|
54 | ||||
39 | echo % build diff with CRLF |
|
55 | echo % build diff with CRLF | |
40 | python ../writelines.py b 5 'a\n' 5 'a\r\n' |
|
56 | python ../writelines.py b 5 'a\n' 5 'a\r\n' | |
41 | hg ci -Am addb |
|
57 | hg ci -Am addb |
@@ -3,6 +3,18 b' abort: unable to read non-existing-file' | |||||
3 | % import URL |
|
3 | % import URL | |
4 | adding url.diff to series file |
|
4 | adding url.diff to series file | |
5 | url.diff |
|
5 | url.diff | |
|
6 | % import patch that already exists | |||
|
7 | abort: patch "url.diff" already exists | |||
|
8 | applying url.diff | |||
|
9 | Now at: url.diff | |||
|
10 | foo | |||
|
11 | Patch queue now empty | |||
|
12 | % qimport -f | |||
|
13 | adding url.diff to series file | |||
|
14 | applying url.diff | |||
|
15 | Now at: url.diff | |||
|
16 | foo2 | |||
|
17 | Patch queue now empty | |||
6 | % build diff with CRLF |
|
18 | % build diff with CRLF | |
7 | adding b |
|
19 | adding b | |
8 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
20 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
General Comments 0
You need to be logged in to leave comments.
Login now