Mercurial > hg
comparison hgext/mq.py @ 6637:79434e68512a
Merge with crew-stable
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Sat, 24 May 2008 18:23:13 +0200 |
parents | 92ee960a928d d9266e48cd27 |
children | 8c01ce1f2530 |
comparison
equal
deleted
inserted
replaced
6636:0397f592372f | 6637:79434e68512a |
---|---|
1926 ui.warn(_('no patches in series\n')) | 1926 ui.warn(_('no patches in series\n')) |
1927 return 0 | 1927 return 0 |
1928 patch = q.series[-1] | 1928 patch = q.series[-1] |
1929 if opts['merge']: | 1929 if opts['merge']: |
1930 if opts['name']: | 1930 if opts['name']: |
1931 newpath = opts['name'] | 1931 newpath = repo.join(opts['name']) |
1932 else: | 1932 else: |
1933 newpath, i = lastsavename(q.path) | 1933 newpath, i = lastsavename(q.path) |
1934 if not newpath: | 1934 if not newpath: |
1935 ui.warn("no saved queues found, please use -n\n") | 1935 ui.warn("no saved queues found, please use -n\n") |
1936 return 1 | 1936 return 1 |