Mercurial > hg
comparison hgext/mq.py @ 6557:f2bd49752f0d
merge from crew-stable
| author | Dirkjan Ochtman <dirkjan@ochtman.nl> |
|---|---|
| date | Wed, 16 Apr 2008 12:15:43 +0200 |
| parents | 36434ca0e7b0 0bb76d168437 |
| children | 550c53d66949 |
comparison
equal
deleted
inserted
replaced
| 6556:f2abfca4beb8 | 6557:f2bd49752f0d |
|---|---|
| 1901 newpath = path + ".%d" % (index + 1) | 1901 newpath = path + ".%d" % (index + 1) |
| 1902 return newpath | 1902 return newpath |
| 1903 | 1903 |
| 1904 def push(ui, repo, patch=None, **opts): | 1904 def push(ui, repo, patch=None, **opts): |
| 1905 """push the next patch onto the stack | 1905 """push the next patch onto the stack |
| 1906 | 1906 |
| 1907 When --force is applied, all local changes in patched files will be lost. | 1907 When --force is applied, all local changes in patched files will be lost. |
| 1908 """ | 1908 """ |
| 1909 q = repo.mq | 1909 q = repo.mq |
| 1910 mergeq = None | 1910 mergeq = None |
| 1911 | 1911 |