##// END OF EJS Templates
mq: fix qpop of working directory parent patch when not at qtip...
Mads Kiilerich -
r18342:de99de39 default
parent child Browse files
Show More
@@ -1406,8 +1406,6 b' class queue(object):'
1406 self.applieddirty = True
1406 self.applieddirty = True
1407 end = len(self.applied)
1407 end = len(self.applied)
1408 rev = self.applied[start].node
1408 rev = self.applied[start].node
1409 if update:
1410 top = self.checktoppatch(repo)[0]
1411
1409
1412 try:
1410 try:
1413 heads = repo.changelog.heads(rev)
1411 heads = repo.changelog.heads(rev)
@@ -1428,7 +1426,7 b' class queue(object):'
1428 if update:
1426 if update:
1429 qp = self.qparents(repo, rev)
1427 qp = self.qparents(repo, rev)
1430 ctx = repo[qp]
1428 ctx = repo[qp]
1431 m, a, r, d = repo.status(qp, top)[:4]
1429 m, a, r, d = repo.status(qp, '.')[:4]
1432 if d:
1430 if d:
1433 raise util.Abort(_("deletions found between repo revs"))
1431 raise util.Abort(_("deletions found between repo revs"))
1434
1432
@@ -46,20 +46,35 b' Using index:'
46 applying c.patch
46 applying c.patch
47 now at: c.patch
47 now at: c.patch
48
48
49 No warnings when using index:
49 No warnings when using index ... and update from non-qtip and with pending
50 changes in unrelated files:
50
51
51 $ hg qnew bug314159
52 $ hg qnew bug314159
52 $ echo d >> c
53 $ echo d >> c
53 $ hg qrefresh
54 $ hg qrefresh
54 $ hg qnew bug141421
55 $ hg qnew bug141421
55 $ echo e >> c
56 $ echo e >> b
56 $ hg qrefresh
57 $ hg qrefresh
57
58
59 $ hg up -r bug314159
60 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
61 $ echo f >> a
62 $ echo f >> b
63 $ echo f >> c
64
58 $ hg qgoto 1
65 $ hg qgoto 1
66 abort: local changes found, refresh first
67 [255]
68 $ hg qgoto 1 -f
59 popping bug141421
69 popping bug141421
60 popping bug314159
70 popping bug314159
61 popping c.patch
71 popping c.patch
62 now at: b.patch
72 now at: b.patch
73 $ hg st
74 M a
75 M b
76 ? c.orig
77 $ hg up -qCr.
63
78
64 $ hg qgoto 3
79 $ hg qgoto 3
65 applying c.patch
80 applying c.patch
General Comments 0
You need to be logged in to leave comments. Login now