equal
deleted
inserted
replaced
26 | summary: A1 |
26 | summary: A1 |
27 | |
27 | |
28 | x changeset: 1:471f378eab4c |
28 | x changeset: 1:471f378eab4c |
29 |/ user: test |
29 |/ user: test |
30 | date: Thu Jan 01 00:00:00 1970 +0000 |
30 | date: Thu Jan 01 00:00:00 1970 +0000 |
31 | obsolete: reworded using amend as 2:fdf9bde5129a |
31 | obsolete: reworded as fdf9bde5129a |
32 | summary: A0 |
32 | summary: A0 |
33 | |
33 | |
34 o changeset: 0:ea207398892e |
34 o changeset: 0:ea207398892e |
35 user: test |
35 user: test |
36 date: Thu Jan 01 00:00:00 1970 +0000 |
36 date: Thu Jan 01 00:00:00 1970 +0000 |
39 $ hg update --hidden 'desc(A0)' |
39 $ hg update --hidden 'desc(A0)' |
40 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
40 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
41 working directory parent is obsolete! (471f378eab4c) |
41 working directory parent is obsolete! (471f378eab4c) |
42 (use 'hg evolve' to update to its successor: fdf9bde5129a) |
42 (use 'hg evolve' to update to its successor: fdf9bde5129a) |
43 $ hg phase -p . |
43 $ hg phase -p . |
44 1 new phase-divergent changesets |
44 1 new bumped changesets |
45 $ hg log --hidden -G |
45 $ hg log --hidden -G |
46 o changeset: 2:fdf9bde5129a |
46 o changeset: 2:fdf9bde5129a |
47 | tag: tip |
47 | tag: tip |
48 | parent: 0:ea207398892e |
48 | parent: 0:ea207398892e |
49 | user: test |
49 | user: test |
50 | date: Thu Jan 01 00:00:00 1970 +0000 |
50 | date: Thu Jan 01 00:00:00 1970 +0000 |
51 | instability: phase-divergent |
51 | trouble: bumped |
52 | summary: A1 |
52 | summary: A1 |
53 | |
53 | |
54 | @ changeset: 1:471f378eab4c |
54 | @ changeset: 1:471f378eab4c |
55 |/ user: test |
55 |/ user: test |
56 | date: Thu Jan 01 00:00:00 1970 +0000 |
56 | date: Thu Jan 01 00:00:00 1970 +0000 |
65 ----------- |
65 ----------- |
66 |
66 |
67 Check that debugobshistory on the divergent revision show both destinations |
67 Check that debugobshistory on the divergent revision show both destinations |
68 $ hg obslog --hidden 471f378eab4c --patch |
68 $ hg obslog --hidden 471f378eab4c --patch |
69 @ 471f378eab4c (1) A0 |
69 @ 471f378eab4c (1) A0 |
70 rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
70 rewritten(description) as fdf9bde5129a by test (Thu Jan 01 00:00:00 1970 +0000) |
71 diff -r 471f378eab4c -r fdf9bde5129a changeset-description |
71 diff -r 471f378eab4c -r fdf9bde5129a changeset-description |
72 --- a/changeset-description |
72 --- a/changeset-description |
73 +++ b/changeset-description |
73 +++ b/changeset-description |
74 @@ -1,1 +1,1 @@ |
74 @@ -1,1 +1,1 @@ |
75 -A0 |
75 -A0 |
80 Check that with all option, every changeset is shown |
80 Check that with all option, every changeset is shown |
81 $ hg obslog --hidden --all 471f378eab4c --patch |
81 $ hg obslog --hidden --all 471f378eab4c --patch |
82 o fdf9bde5129a (2) A1 |
82 o fdf9bde5129a (2) A1 |
83 | |
83 | |
84 @ 471f378eab4c (1) A0 |
84 @ 471f378eab4c (1) A0 |
85 rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
85 rewritten(description) as fdf9bde5129a by test (Thu Jan 01 00:00:00 1970 +0000) |
86 diff -r 471f378eab4c -r fdf9bde5129a changeset-description |
86 diff -r 471f378eab4c -r fdf9bde5129a changeset-description |
87 --- a/changeset-description |
87 --- a/changeset-description |
88 +++ b/changeset-description |
88 +++ b/changeset-description |
89 @@ -1,1 +1,1 @@ |
89 @@ -1,1 +1,1 @@ |
90 -A0 |
90 -A0 |
101 0 (glob) |
101 0 (glob) |
102 ], |
102 ], |
103 "effect": [ |
103 "effect": [ |
104 "description" |
104 "description" |
105 ], |
105 ], |
106 "operation": "amend", |
|
107 "succnodes": [ |
106 "succnodes": [ |
108 "fdf9bde5129a" |
107 "fdf9bde5129a" |
109 ], |
108 ], |
110 "user": "test", |
109 "user": "test", |
111 "verb": "rewritten" |
110 "verb": "rewritten" |
120 and the diverent one |
119 and the diverent one |
121 $ hg obslog fdf9bde5129a --patch |
120 $ hg obslog fdf9bde5129a --patch |
122 o fdf9bde5129a (2) A1 |
121 o fdf9bde5129a (2) A1 |
123 | |
122 | |
124 @ 471f378eab4c (1) A0 |
123 @ 471f378eab4c (1) A0 |
125 rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
124 rewritten(description) as fdf9bde5129a by test (Thu Jan 01 00:00:00 1970 +0000) |
126 diff -r 471f378eab4c -r fdf9bde5129a changeset-description |
125 diff -r 471f378eab4c -r fdf9bde5129a changeset-description |
127 --- a/changeset-description |
126 --- a/changeset-description |
128 +++ b/changeset-description |
127 +++ b/changeset-description |
129 @@ -1,1 +1,1 @@ |
128 @@ -1,1 +1,1 @@ |
130 -A0 |
129 -A0 |
135 Check that all option show all of them |
134 Check that all option show all of them |
136 $ hg obslog fdf9bde5129a -a --patch |
135 $ hg obslog fdf9bde5129a -a --patch |
137 o fdf9bde5129a (2) A1 |
136 o fdf9bde5129a (2) A1 |
138 | |
137 | |
139 @ 471f378eab4c (1) A0 |
138 @ 471f378eab4c (1) A0 |
140 rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
139 rewritten(description) as fdf9bde5129a by test (Thu Jan 01 00:00:00 1970 +0000) |
141 diff -r 471f378eab4c -r fdf9bde5129a changeset-description |
140 diff -r 471f378eab4c -r fdf9bde5129a changeset-description |
142 --- a/changeset-description |
141 --- a/changeset-description |
143 +++ b/changeset-description |
142 +++ b/changeset-description |
144 @@ -1,1 +1,1 @@ |
143 @@ -1,1 +1,1 @@ |
145 -A0 |
144 -A0 |
150 and the diverent one |
149 and the diverent one |
151 $ hg obslog fdf9bde5129a --patch |
150 $ hg obslog fdf9bde5129a --patch |
152 o fdf9bde5129a (2) A1 |
151 o fdf9bde5129a (2) A1 |
153 | |
152 | |
154 @ 471f378eab4c (1) A0 |
153 @ 471f378eab4c (1) A0 |
155 rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
154 rewritten(description) as fdf9bde5129a by test (Thu Jan 01 00:00:00 1970 +0000) |
156 diff -r 471f378eab4c -r fdf9bde5129a changeset-description |
155 diff -r 471f378eab4c -r fdf9bde5129a changeset-description |
157 --- a/changeset-description |
156 --- a/changeset-description |
158 +++ b/changeset-description |
157 +++ b/changeset-description |
159 @@ -1,1 +1,1 @@ |
158 @@ -1,1 +1,1 @@ |
160 -A0 |
159 -A0 |
164 Check that all option show all of them |
163 Check that all option show all of them |
165 $ hg obslog fdf9bde5129a -a --patch |
164 $ hg obslog fdf9bde5129a -a --patch |
166 o fdf9bde5129a (2) A1 |
165 o fdf9bde5129a (2) A1 |
167 | |
166 | |
168 @ 471f378eab4c (1) A0 |
167 @ 471f378eab4c (1) A0 |
169 rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
168 rewritten(description) as fdf9bde5129a by test (Thu Jan 01 00:00:00 1970 +0000) |
170 diff -r 471f378eab4c -r fdf9bde5129a changeset-description |
169 diff -r 471f378eab4c -r fdf9bde5129a changeset-description |
171 --- a/changeset-description |
170 --- a/changeset-description |
172 +++ b/changeset-description |
171 +++ b/changeset-description |
173 @@ -1,1 +1,1 @@ |
172 @@ -1,1 +1,1 @@ |
174 -A0 |
173 -A0 |
179 graph |
178 graph |
180 $ hg obslog 'fdf9bde5129a+fdf9bde5129a' --patch |
179 $ hg obslog 'fdf9bde5129a+fdf9bde5129a' --patch |
181 o fdf9bde5129a (2) A1 |
180 o fdf9bde5129a (2) A1 |
182 | |
181 | |
183 @ 471f378eab4c (1) A0 |
182 @ 471f378eab4c (1) A0 |
184 rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
183 rewritten(description) as fdf9bde5129a by test (Thu Jan 01 00:00:00 1970 +0000) |
185 diff -r 471f378eab4c -r fdf9bde5129a changeset-description |
184 diff -r 471f378eab4c -r fdf9bde5129a changeset-description |
186 --- a/changeset-description |
185 --- a/changeset-description |
187 +++ b/changeset-description |
186 +++ b/changeset-description |
188 @@ -1,1 +1,1 @@ |
187 @@ -1,1 +1,1 @@ |
189 -A0 |
188 -A0 |
206 0 |
205 0 |
207 ], |
206 ], |
208 "effect": [ |
207 "effect": [ |
209 "description" |
208 "description" |
210 ], |
209 ], |
211 "operation": "amend", |
|
212 "succnodes": [ |
210 "succnodes": [ |
213 "fdf9bde5129a" |
211 "fdf9bde5129a" |
214 ], |
212 ], |
215 "user": "test", |
213 "user": "test", |
216 "verb": "rewritten" |
214 "verb": "rewritten" |