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 unstable changesets |
49 $ glog |
49 $ glog |
50 @ 7:f5ff10856e5a@default(draft) adda |
50 @ 7:005fe5914f78@default(draft) adda |
51 | |
51 | |
52 | o 5:ab8cbb6d87ff@default(draft) addb |
52 | o 5: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 | |/ |
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:[5] addb |
67 atop:[7] adda |
67 atop:[7] adda |
68 hg rebase -r ab8cbb6d87ff -d f5ff10856e5a |
68 hg rebase -r 22619daeed78 -d 005fe5914f78 |
69 resolving manifests |
69 resolving manifests |
70 getting b |
70 getting b |
71 b |
71 b |
72 $ glog |
72 $ glog |
73 @ 8:6bf44048e43f@default(draft) addb |
73 @ 8:bede829dd2d3@default(draft) addb |
74 | |
74 | |
75 o 7:f5ff10856e5a@default(draft) adda |
75 o 7:005fe5914f78@default(draft) adda |
76 | |
76 | |
77 | o 3:7a7552255fb5@default(draft) addc |
77 | o 3:7a7552255fb5@default(draft) addc |
78 | | |
78 | | |
79 | x 2:ef23d6ef94d6@default(draft) addb |
79 | x 2:ef23d6ef94d6@default(draft) addb |
80 | | |
80 | | |
89 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
89 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
90 $ hg debugobsolete > successors.old |
90 $ hg debugobsolete > successors.old |
91 $ hg evolve -v |
91 $ hg evolve -v |
92 move:[3] addc |
92 move:[3] addc |
93 atop:[8] addb |
93 atop:[8] addb |
94 hg rebase -r 7a7552255fb5 -d 6bf44048e43f |
94 hg rebase -r 7a7552255fb5 -d bede829dd2d3 |
95 resolving manifests |
95 resolving manifests |
96 getting b |
96 getting b |
97 resolving manifests |
97 resolving manifests |
98 getting c |
98 getting c |
99 c |
99 c |
100 $ hg debugobsolete > successors.new |
100 $ hg debugobsolete > successors.new |
101 $ diff -u successors.old successors.new |
101 $ diff -u successors.old successors.new |
102 --- successors.old* (glob) |
102 --- successors.old* (glob) |
103 +++ successors.new* (glob) |
103 +++ successors.new* (glob) |
104 @@ -3,3 +3,4 @@ |
104 @@ -3,3 +3,4 @@ |
105 93418d2c0979643ad446f621195e78720edb05b4 f5ff10856e5ab3c8dc420b9c11460e6832a3b78c 0 {'date': '* *', 'user': 'test'} (glob) |
105 93418d2c0979643ad446f621195e78720edb05b4 005fe5914f78e8bc64c7eba28117b0b1fa210d0d 0 {'date': '* *', 'user': 'test'} (glob) |
106 3a4a591493f80708e46f2bf6d3b4debfad8ff91e 0 {'date': '* *', 'user': 'test'} (glob) |
106 7a7d76dc97c57751de9e80f61ed2a639bd03cd24 0 {'date': '* *', 'user': 'test'} (glob) |
107 ab8cbb6d87ff3ab5526735a051cba6b63f3d6775 6bf44048e43f830accbf7d2bd7bc252ad7a3b99c 0 {'date': '* *', 'user': 'test'} (glob) |
107 22619daeed78036f80fbd326b6852519c4f0c25e bede829dd2d3b2ae9bf198c23432b250dc964458 0 {'date': '* *', 'user': 'test'} (glob) |
108 +7a7552255fb5f8bd745e46fba6f0ca633a4dd716 5e819fbb0d278117c0a83b7f6f6486689732cfb2 0 {'date': '* *', 'user': 'test'} (glob) |
108 +7a7552255fb5f8bd745e46fba6f0ca633a4dd716 65095d7d0dd5e4f15503bb7b1f433a5fe9bac052 0 {'date': '* *', 'user': 'test'} (glob) |
109 [1] |
109 [1] |
|
110 |
|
111 |
|
112 |
110 $ glog |
113 $ glog |
111 @ 9:5e819fbb0d27@default(draft) addc |
114 @ 9:65095d7d0dd5@default(draft) addc |
112 | |
115 | |
113 o 8:6bf44048e43f@default(draft) addb |
116 o 8:bede829dd2d3@default(draft) addb |
114 | |
117 | |
115 o 7:f5ff10856e5a@default(draft) adda |
118 o 7:005fe5914f78@default(draft) adda |
116 | |
119 | |
117 o 0:c471ef929e6a@default(draft) addroot |
120 o 0:c471ef929e6a@default(draft) addroot |
118 |
121 |
119 $ hg evolve -v |
122 $ hg evolve -v |
120 no troubled changesets |
123 no troubled changesets |
126 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
129 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
127 $ echo b >> b |
130 $ echo b >> b |
128 $ hg amend |
131 $ hg amend |
129 1 new unstable changesets |
132 1 new unstable changesets |
130 $ glog |
133 $ glog |
131 @ 11:4e7cec6b4afe@default(draft) addb |
134 @ 11:036cf654e942@default(draft) addb |
132 | |
135 | |
133 | o 9:5e819fbb0d27@default(draft) addc |
136 | o 9:65095d7d0dd5@default(draft) addc |
134 | | |
137 | | |
135 | x 8:6bf44048e43f@default(draft) addb |
138 | x 8:bede829dd2d3@default(draft) addb |
136 |/ |
139 |/ |
137 o 7:f5ff10856e5a@default(draft) adda |
140 o 7:005fe5914f78@default(draft) adda |
138 | |
141 | |
139 o 0:c471ef929e6a@default(draft) addroot |
142 o 0:c471ef929e6a@default(draft) addroot |
140 |
143 |
141 $ hg up 9 |
144 $ hg up 9 |
142 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
145 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
145 (1 troubled changesets, do you want --any ?) |
148 (1 troubled changesets, do you want --any ?) |
146 [2] |
149 [2] |
147 $ hg evolve --any -v |
150 $ hg evolve --any -v |
148 move:[9] addc |
151 move:[9] addc |
149 atop:[11] addb |
152 atop:[11] addb |
150 hg rebase -r 5e819fbb0d27 -d 4e7cec6b4afe |
153 hg rebase -r 65095d7d0dd5 -d 036cf654e942 |
151 resolving manifests |
154 resolving manifests |
152 removing c |
155 removing c |
153 getting b |
156 getting b |
154 resolving manifests |
157 resolving manifests |
155 getting c |
158 getting c |
156 c |
159 c |
157 $ glog |
160 $ glog |
158 @ 12:24f95816bb21@default(draft) addc |
161 @ 12:e99ecf51c867@default(draft) addc |
159 | |
162 | |
160 o 11:4e7cec6b4afe@default(draft) addb |
163 o 11:036cf654e942@default(draft) addb |
161 | |
164 | |
162 o 7:f5ff10856e5a@default(draft) adda |
165 o 7:005fe5914f78@default(draft) adda |
163 | |
166 | |
164 o 0:c471ef929e6a@default(draft) addroot |
167 o 0:c471ef929e6a@default(draft) addroot |
165 |
168 |
166 $ hg evolve --any -v |
169 $ hg evolve --any -v |
167 no troubled changesets |
170 no troubled changesets |