Show More
@@ -107,7 +107,7 b' class patchheader(object):' | |||||
107 | elif line.startswith("# Date "): |
|
107 | elif line.startswith("# Date "): | |
108 | date = line[7:] |
|
108 | date = line[7:] | |
109 | elif line.startswith("# Parent "): |
|
109 | elif line.startswith("# Parent "): | |
110 | parent = line[9:] |
|
110 | parent = line[9:].lstrip() | |
111 | elif line.startswith("# Branch "): |
|
111 | elif line.startswith("# Branch "): | |
112 | branch = line[9:] |
|
112 | branch = line[9:] | |
113 | elif line.startswith("# Node ID "): |
|
113 | elif line.startswith("# Node ID "): |
@@ -26,7 +26,14 b' make some patches with a parent: 1:d7fe2' | |||||
26 |
|
26 | |||
27 | $ echo cp0 >> fp0 |
|
27 | $ echo cp0 >> fp0 | |
28 | $ hg add fp0 |
|
28 | $ hg add fp0 | |
29 |
$ hg |
|
29 | $ hg ci -m p0 -d "0 0" | |
|
30 | $ hg export -r. > p0 | |||
|
31 | $ hg strip -qn . | |||
|
32 | $ hg qimport p0 | |||
|
33 | adding p0 to series file | |||
|
34 | $ hg qpush | |||
|
35 | applying p0 | |||
|
36 | now at: p0 | |||
30 |
|
37 | |||
31 |
$ |
|
38 | $ echo cp1 >> fp1 | |
32 | $ hg add fp1 |
|
39 | $ hg add fp1 | |
@@ -63,15 +70,6 b' qpush --exact when at the parent' | |||||
63 | $ hg qpop -aq |
|
70 | $ hg qpop -aq | |
64 | patch queue now empty |
|
71 | patch queue now empty | |
65 |
|
72 | |||
66 | $ hg qpush -ea |
|
|||
67 | applying p0 |
|
|||
68 | applying p1 |
|
|||
69 | now at: p1 |
|
|||
70 | $ hg parents -qr qbase |
|
|||
71 | 1:d7fe2034f71b |
|
|||
72 | $ hg qpop -aq |
|
|||
73 | patch queue now empty |
|
|||
74 |
|
||||
75 | qpush --exact when at another rev |
|
73 | qpush --exact when at another rev | |
76 |
|
74 | |||
77 | $ hg update 0 -q |
|
75 | $ hg update 0 -q |
General Comments 0
You need to be logged in to leave comments.
Login now