36 gdown have been deprecated in favor of previous |
36 gdown have been deprecated in favor of previous |
37 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
37 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
38 [2] addb |
38 [2] addb |
39 $ echo b >> b |
39 $ echo b >> b |
40 $ hg amend |
40 $ hg amend |
41 1 new unstable changesets |
41 1 new orphan changesets |
42 $ hg gdown |
42 $ hg gdown |
43 gdown have been deprecated in favor of previous |
43 gdown have been deprecated in favor of previous |
44 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
44 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
45 [1] adda |
45 [1] adda |
46 $ echo a >> a |
46 $ echo a >> a |
47 $ hg amend |
47 $ hg amend |
48 1 new unstable changesets |
48 1 new orphan changesets |
49 $ glog |
49 $ glog |
50 @ 7:005fe5914f78@default(draft) adda |
50 @ 5:005fe5914f78@default(draft) adda |
51 | |
51 | |
52 | o 5:22619daeed78@default(draft) addb |
52 | o 4:22619daeed78@default(draft) addb |
53 | | |
53 | | |
54 | | o 3:7a7552255fb5@default(draft) addc |
54 | | o 3:7a7552255fb5@default(draft) addc |
55 | | | |
55 | | | |
56 | | x 2:ef23d6ef94d6@default(draft) addb |
56 | | x 2:ef23d6ef94d6@default(draft) addb |
57 | |/ |
57 | |/ |
61 |
61 |
62 |
62 |
63 Test stabilizing a predecessor child |
63 Test stabilizing a predecessor child |
64 |
64 |
65 $ hg evolve -v |
65 $ hg evolve -v |
66 move:[5] addb |
66 move:[4] addb |
67 atop:[7] adda |
67 atop:[5] adda |
68 hg rebase -r 22619daeed78 -d 005fe5914f78 |
68 hg rebase -r 22619daeed78 -d 005fe5914f78 |
69 resolving manifests |
69 resolving manifests |
70 getting b |
70 getting b |
71 committing files: |
71 committing files: |
72 b |
72 b |
73 committing manifest |
73 committing manifest |
74 committing changelog |
74 committing changelog |
75 working directory is now at 81b8bbcd5892 |
75 working directory is now at 81b8bbcd5892 |
76 $ glog |
76 $ glog |
77 @ 8:81b8bbcd5892@default(draft) addb |
77 @ 6:81b8bbcd5892@default(draft) addb |
78 | |
78 | |
79 o 7:005fe5914f78@default(draft) adda |
79 o 5:005fe5914f78@default(draft) adda |
80 | |
80 | |
81 | o 3:7a7552255fb5@default(draft) addc |
81 | o 3:7a7552255fb5@default(draft) addc |
82 | | |
82 | | |
83 | x 2:ef23d6ef94d6@default(draft) addb |
83 | x 2:ef23d6ef94d6@default(draft) addb |
84 | | |
84 | | |
92 $ hg up -r 005fe5914f78 |
92 $ hg up -r 005fe5914f78 |
93 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
93 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
94 $ hg debugobsolete > successors.old |
94 $ hg debugobsolete > successors.old |
95 $ hg evolve -v |
95 $ hg evolve -v |
96 move:[3] addc |
96 move:[3] addc |
97 atop:[8] addb |
97 atop:[6] addb |
98 hg rebase -r 7a7552255fb5 -d 81b8bbcd5892 |
98 hg rebase -r 7a7552255fb5 -d 81b8bbcd5892 |
99 resolving manifests |
99 resolving manifests |
100 getting b |
100 getting b |
101 resolving manifests |
101 resolving manifests |
102 getting c |
102 getting c |
107 working directory is now at 0f691739f917 |
107 working directory is now at 0f691739f917 |
108 $ hg debugobsolete > successors.new |
108 $ hg debugobsolete > successors.new |
109 $ diff -u successors.old successors.new |
109 $ diff -u successors.old successors.new |
110 --- successors.old* (glob) |
110 --- successors.old* (glob) |
111 +++ successors.new* (glob) |
111 +++ successors.new* (glob) |
112 @@ -3,3 +3,4 @@ |
112 @@ -1,3 +1,4 @@ |
113 93418d2c0979643ad446f621195e78720edb05b4 005fe5914f78e8bc64c7eba28117b0b1fa210d0d 0 (*) {'ef1': '*', 'user': 'test'} (glob) |
113 ef23d6ef94d68dea65d20587dfecc8b33d165617 22619daeed78036f80fbd326b6852519c4f0c25e 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'} |
114 7a7d76dc97c57751de9e80f61ed2a639bd03cd24 0 {93418d2c0979643ad446f621195e78720edb05b4} (*) {'ef1': '*', 'user': 'test'} (glob) |
114 93418d2c0979643ad446f621195e78720edb05b4 005fe5914f78e8bc64c7eba28117b0b1fa210d0d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'} |
115 22619daeed78036f80fbd326b6852519c4f0c25e 81b8bbcd5892841efed41433d7a5e9df922396cb 0 (*) {'ef1': '*', 'user': 'test'} (glob) |
115 22619daeed78036f80fbd326b6852519c4f0c25e 81b8bbcd5892841efed41433d7a5e9df922396cb 0 (*) {'ef1': '4', 'user': 'test'} (glob) |
116 +7a7552255fb5f8bd745e46fba6f0ca633a4dd716 0f691739f91762462bf8ba21f35fdf71fe64310e 0 (*) {'ef1': '*', 'user': 'test'} (glob) |
116 +7a7552255fb5f8bd745e46fba6f0ca633a4dd716 0f691739f91762462bf8ba21f35fdf71fe64310e 0 (*) {'ef1': '4', 'user': 'test'} (glob) |
117 [1] |
117 [1] |
118 |
118 |
119 |
119 |
120 |
120 |
121 $ glog |
121 $ glog |
122 @ 9:0f691739f917@default(draft) addc |
122 @ 7:0f691739f917@default(draft) addc |
123 | |
123 | |
124 o 8:81b8bbcd5892@default(draft) addb |
124 o 6:81b8bbcd5892@default(draft) addb |
125 | |
125 | |
126 o 7:005fe5914f78@default(draft) adda |
126 o 5:005fe5914f78@default(draft) adda |
127 | |
127 | |
128 o 0:c471ef929e6a@default(draft) addroot |
128 o 0:c471ef929e6a@default(draft) addroot |
129 |
129 |
130 $ hg evolve -v |
130 $ hg evolve -v |
131 no troubled changesets |
131 no troubled changesets |
135 |
135 |
136 $ hg up 81b8bbcd5892 |
136 $ hg up 81b8bbcd5892 |
137 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
137 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
138 $ echo b >> b |
138 $ echo b >> b |
139 $ hg amend |
139 $ hg amend |
140 1 new unstable changesets |
140 1 new orphan changesets |
141 $ glog |
141 $ glog |
142 @ 11:7a68bc4596ea@default(draft) addb |
142 @ 8:7a68bc4596ea@default(draft) addb |
143 | |
143 | |
144 | o 9:0f691739f917@default(draft) addc |
144 | o 7:0f691739f917@default(draft) addc |
145 | | |
145 | | |
146 | x 8:81b8bbcd5892@default(draft) addb |
146 | x 6:81b8bbcd5892@default(draft) addb |
147 |/ |
147 |/ |
148 o 7:005fe5914f78@default(draft) adda |
148 o 5:005fe5914f78@default(draft) adda |
149 | |
149 | |
150 o 0:c471ef929e6a@default(draft) addroot |
150 o 0:c471ef929e6a@default(draft) addroot |
151 |
151 |
152 $ hg up 0f691739f917 |
152 $ hg up 0f691739f917 |
153 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
153 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
154 $ hg evolve -v |
154 $ hg evolve -v |
155 nothing to evolve on current working copy parent |
155 nothing to evolve on current working copy parent |
156 (1 other orphan in the repository, do you want --any or --rev) |
156 (1 other orphan in the repository, do you want --any or --rev) |
157 [2] |
157 [2] |
158 $ hg evolve --any -v |
158 $ hg evolve --any -v |
159 move:[9] addc |
159 move:[7] addc |
160 atop:[11] addb |
160 atop:[8] addb |
161 hg rebase -r 0f691739f917 -d 7a68bc4596ea |
161 hg rebase -r 0f691739f917 -d 7a68bc4596ea |
162 resolving manifests |
162 resolving manifests |
163 removing c |
163 removing c |
164 getting b |
164 getting b |
165 resolving manifests |
165 resolving manifests |
168 c |
168 c |
169 committing manifest |
169 committing manifest |
170 committing changelog |
170 committing changelog |
171 working directory is now at 2256dae6521f |
171 working directory is now at 2256dae6521f |
172 $ glog |
172 $ glog |
173 @ 12:2256dae6521f@default(draft) addc |
173 @ 9:2256dae6521f@default(draft) addc |
174 | |
174 | |
175 o 11:7a68bc4596ea@default(draft) addb |
175 o 8:7a68bc4596ea@default(draft) addb |
176 | |
176 | |
177 o 7:005fe5914f78@default(draft) adda |
177 o 5:005fe5914f78@default(draft) adda |
178 | |
178 | |
179 o 0:c471ef929e6a@default(draft) addroot |
179 o 0:c471ef929e6a@default(draft) addroot |
180 |
180 |
181 $ hg evolve --any -v |
181 $ hg evolve --any -v |
182 no orphan changesets to evolve |
182 no orphan changesets to evolve |
193 $ hg ci -m secondambiguous |
193 $ hg ci -m secondambiguous |
194 created new head |
194 created new head |
195 $ hg up .^ |
195 $ hg up .^ |
196 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
196 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
197 $ hg commit --amend -m "newmessage" |
197 $ hg commit --amend -m "newmessage" |
198 2 new unstable changesets |
198 2 new orphan changesets |
199 $ hg log -G |
199 $ hg log -G |
200 @ changeset: 15:f83a0bce03e4 |
200 @ changeset: 12:f83a0bce03e4 |
201 | tag: tip |
201 | tag: tip |
202 | parent: 11:7a68bc4596ea |
202 | parent: 8:7a68bc4596ea |
203 | user: test |
203 | user: test |
204 | date: Thu Jan 01 00:00:00 1970 +0000 |
204 | date: Thu Jan 01 00:00:00 1970 +0000 |
205 | summary: newmessage |
205 | summary: newmessage |
206 | |
206 | |
207 | o changeset: 14:fa68011f392e |
207 | o changeset: 11:fa68011f392e |
208 | | parent: 12:2256dae6521f |
208 | | parent: 9:2256dae6521f |
209 | | user: test |
209 | | user: test |
210 | | date: Thu Jan 01 00:00:00 1970 +0000 |
210 | | date: Thu Jan 01 00:00:00 1970 +0000 |
211 | | trouble: unstable |
211 | | instability: orphan |
212 | | summary: secondambiguous |
212 | | summary: secondambiguous |
213 | | |
213 | | |
214 | | o changeset: 13:bdc003b6eec2 |
214 | | o changeset: 10:bdc003b6eec2 |
215 | |/ user: test |
215 | |/ user: test |
216 | | date: Thu Jan 01 00:00:00 1970 +0000 |
216 | | date: Thu Jan 01 00:00:00 1970 +0000 |
217 | | trouble: unstable |
217 | | instability: orphan |
218 | | summary: firstambiguous |
218 | | summary: firstambiguous |
219 | | |
219 | | |
220 | x changeset: 12:2256dae6521f |
220 | x changeset: 9:2256dae6521f |
221 |/ user: test |
221 |/ user: test |
222 | date: Thu Jan 01 00:00:00 1970 +0000 |
222 | date: Thu Jan 01 00:00:00 1970 +0000 |
223 | obsolete: reworded as f83a0bce03e4 |
223 | obsolete: reworded as 12:f83a0bce03e4 |
224 | summary: addc |
224 | summary: addc |
225 | |
225 | |
226 o changeset: 11:7a68bc4596ea |
226 o changeset: 8:7a68bc4596ea |
227 | parent: 7:005fe5914f78 |
227 | parent: 5:005fe5914f78 |
228 | user: test |
228 | user: test |
229 | date: Thu Jan 01 00:00:00 1970 +0000 |
229 | date: Thu Jan 01 00:00:00 1970 +0000 |
230 | summary: addb |
230 | summary: addb |
231 | |
231 | |
232 o changeset: 7:005fe5914f78 |
232 o changeset: 5:005fe5914f78 |
233 | parent: 0:c471ef929e6a |
233 | parent: 0:c471ef929e6a |
234 | user: test |
234 | user: test |
235 | date: Thu Jan 01 00:00:00 1970 +0000 |
235 | date: Thu Jan 01 00:00:00 1970 +0000 |
236 | summary: adda |
236 | summary: adda |
237 | |
237 | |