##// END OF EJS Templates
mq: fix qpush changes detection of renamed files...
Patrick Mezard -
r14347:e8debe1e default
parent child Browse files
Show More
@@ -1315,6 +1315,10 b' def changedfiles(patchpath, strip=1):'
1315 for gp in values:
1315 for gp in values:
1316 gp.path = pathstrip(gp.path, strip - 1)[1]
1316 gp.path = pathstrip(gp.path, strip - 1)[1]
1317 changed.add(gp.path)
1317 changed.add(gp.path)
1318 if gp.oldpath:
1319 gp.oldpath = pathstrip(gp.oldpath, strip - 1)[1]
1320 if gp.op == 'RENAME':
1321 changed.add(gp.oldpath)
1318 else:
1322 else:
1319 raise util.Abort(_('unsupported parser state: %s') % state)
1323 raise util.Abort(_('unsupported parser state: %s') % state)
1320 return changed
1324 return changed
@@ -1299,6 +1299,23 b' related changes with force'
1299 popping foo
1299 popping foo
1300 patch queue now empty
1300 patch queue now empty
1301 $ hg st
1301 $ hg st
1302
1303 related renamed source without change
1304 $ hg qpush
1305 applying foo
1306 now at: foo
1307 $ echo 1 > 1
1308 $ hg mv 1 2
1309 $ hg qref --git
1310 $ hg qpop
1311 popping foo
1312 patch queue now empty
1313 $ echo 3 > 1
1314 $ hg st
1315 M 1
1316 $ hg qpush
1317 abort: local changes found
1318 [255]
1302 $ cd ..
1319 $ cd ..
1303
1320
1304 test qpush with --force, issue1087
1321 test qpush with --force, issue1087
General Comments 0
You need to be logged in to leave comments. Login now