Mercurial > hg > mercurial-crew-with-dirclash
changeset 3685:193e9c6d1a6d
Issue424: mq patch loses guard when qrenamed
author | Mathieu Clabaut <mathieu.clabaut@gmail.com> |
---|---|
date | Sun, 19 Nov 2006 23:47:19 +0100 |
parents | 975c2469c316 |
children | 4308f4cdc07b |
files | hgext/mq.py tests/test-mq-guards tests/test-mq-guards.out |
diffstat | 3 files changed, 18 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/mq.py +++ b/hgext/mq.py @@ -1794,7 +1794,8 @@ def rename(ui, repo, patch, name=None, * if ui.verbose: ui.write('Renaming %s to %s\n' % (patch, name)) i = q.find_series(patch) - q.full_series[i] = name + guards = q.guard_re.findall(q.full_series[i]) + q.full_series[i] = name + ''.join([' #' + g for g in guards]) q.parse_series() q.series_dirty = 1
--- a/tests/test-mq-guards +++ b/tests/test-mq-guards @@ -98,3 +98,12 @@ echo % guards in series file: +1 +2 -3 hg qselect -s echo % should show c.patch hg qapplied + +hg qrename a.patch new.patch +echo % should show : +echo % new.patch: +1 +2 -3 +echo % b.patch: +2 +echo % c.patch: unguarded +hg qguard -l + +