##// END OF EJS Templates
mq: handle added patch renaming correctly
Weijun Wang -
r6648:2519976a default
parent child Browse files
Show More
@@ -2011,10 +2011,14 b' def rename(ui, repo, patch, name=None, *'
2011 if r:
2011 if r:
2012 wlock = r.wlock()
2012 wlock = r.wlock()
2013 try:
2013 try:
2014 if r.dirstate[name] == 'r':
2014 if r.dirstate[patch] == 'a':
2015 r.undelete([name])
2015 r.dirstate.forget(patch)
2016 r.copy(patch, name)
2016 r.dirstate.add(name)
2017 r.remove([patch], False)
2017 else:
2018 if r.dirstate[name] == 'r':
2019 r.undelete([name])
2020 r.copy(patch, name)
2021 r.remove([patch], False)
2018 finally:
2022 finally:
2019 del wlock
2023 del wlock
2020
2024
General Comments 0
You need to be logged in to leave comments. Login now