Show More
@@ -987,7 +987,12 b' class queue(object):' | |||||
987 | diffopts = self.diffopts() |
|
987 | diffopts = self.diffopts() | |
988 | wlock = repo.wlock() |
|
988 | wlock = repo.wlock() | |
989 | try: |
|
989 | try: | |
990 | if repo.dirstate.parents()[0] not in repo.heads(): |
|
990 | heads = [] | |
|
991 | for b, ls in repo.branchmap().iteritems(): | |||
|
992 | heads += ls | |||
|
993 | if not heads: | |||
|
994 | heads = [nullid] | |||
|
995 | if repo.dirstate.parents()[0] not in heads: | |||
991 | self.ui.status(_("(working directory not at a head)\n")) |
|
996 | self.ui.status(_("(working directory not at a head)\n")) | |
992 |
|
997 | |||
993 | if not self.series: |
|
998 | if not self.series: |
@@ -42,3 +42,23 b' hg qrefresh' | |||||
42 |
|
42 | |||
43 | echo '% tip:' |
|
43 | echo '% tip:' | |
44 | hg tip --template '{rev} {desc}\n' |
|
44 | hg tip --template '{rev} {desc}\n' | |
|
45 | ||||
|
46 | echo '% qpush warning branchheads' | |||
|
47 | cd .. | |||
|
48 | hg init branchy | |||
|
49 | cd branchy | |||
|
50 | echo q > q | |||
|
51 | hg add q | |||
|
52 | hg qnew -f qp | |||
|
53 | hg qpop | |||
|
54 | echo a > a | |||
|
55 | hg ci -Ama | |||
|
56 | hg up null | |||
|
57 | hg branch b | |||
|
58 | echo c > c | |||
|
59 | hg ci -Amc | |||
|
60 | hg merge default | |||
|
61 | hg ci -mmerge | |||
|
62 | hg up default | |||
|
63 | hg log | |||
|
64 | hg qpush |
@@ -12,3 +12,37 b' abort: popping would remove a revision n' | |||||
12 | abort: cannot refresh a revision with children |
|
12 | abort: cannot refresh a revision with children | |
13 | % tip: |
|
13 | % tip: | |
14 | 3 append quux |
|
14 | 3 append quux | |
|
15 | % qpush warning branchheads | |||
|
16 | popping qp | |||
|
17 | patch queue now empty | |||
|
18 | adding a | |||
|
19 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |||
|
20 | marked working directory as branch b | |||
|
21 | adding c | |||
|
22 | created new head | |||
|
23 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||
|
24 | (branch merge, don't forget to commit) | |||
|
25 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |||
|
26 | changeset: 2:65309210bf4e | |||
|
27 | branch: b | |||
|
28 | tag: tip | |||
|
29 | parent: 1:707adb4c8ae1 | |||
|
30 | parent: 0:cb9a9f314b8b | |||
|
31 | user: test | |||
|
32 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
33 | summary: merge | |||
|
34 | ||||
|
35 | changeset: 1:707adb4c8ae1 | |||
|
36 | branch: b | |||
|
37 | parent: -1:000000000000 | |||
|
38 | user: test | |||
|
39 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
40 | summary: c | |||
|
41 | ||||
|
42 | changeset: 0:cb9a9f314b8b | |||
|
43 | user: test | |||
|
44 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
45 | summary: a | |||
|
46 | ||||
|
47 | applying qp | |||
|
48 | now at: qp |
General Comments 0
You need to be logged in to leave comments.
Login now