Show More
@@ -1699,7 +1699,7 b' class queue(object):' | |||||
1699 |
|
1699 | |||
1700 | self.ui.write(_('renaming %s to %s\n') |
|
1700 | self.ui.write(_('renaming %s to %s\n') | |
1701 | % (filename, patchname)) |
|
1701 | % (filename, patchname)) | |
1702 |
|
|
1702 | util.rename(originpath, self.join(patchname)) | |
1703 | else: |
|
1703 | else: | |
1704 | patchname = filename |
|
1704 | patchname = filename | |
1705 |
|
1705 |
@@ -118,3 +118,10 b' hg qdel -k 2.diff' | |||||
118 | echo % qimport -e --name newname oldexisitingpatch |
|
118 | echo % qimport -e --name newname oldexisitingpatch | |
119 | hg qimport -e --name this-name-is-better 2.diff |
|
119 | hg qimport -e --name this-name-is-better 2.diff | |
120 | hg qser |
|
120 | hg qser | |
|
121 | echo % qimport -e --name without --force | |||
|
122 | cp .hg/patches/this-name-is-better .hg/patches/3.diff | |||
|
123 | hg qimport -e --name this-name-is-better 3.diff | |||
|
124 | hg qser | |||
|
125 | echo % qimport -e --name with --force | |||
|
126 | hg qimport --force -e --name this-name-is-better 3.diff | |||
|
127 | hg qser |
@@ -61,3 +61,12 b' renaming 2.diff to this-name-is-better' | |||||
61 | adding this-name-is-better to series file |
|
61 | adding this-name-is-better to series file | |
62 | this-name-is-better |
|
62 | this-name-is-better | |
63 | url.diff |
|
63 | url.diff | |
|
64 | % qimport -e --name without --force | |||
|
65 | abort: patch "this-name-is-better" already exists | |||
|
66 | this-name-is-better | |||
|
67 | url.diff | |||
|
68 | % qimport -e --name with --force | |||
|
69 | renaming 3.diff to this-name-is-better | |||
|
70 | adding this-name-is-better to series file | |||
|
71 | this-name-is-better | |||
|
72 | url.diff |
General Comments 0
You need to be logged in to leave comments.
Login now