Mercurial > evolve

comparison tests/test-stabilize-result.t @ 1750:1dbb8fdb725a mercurial-3.5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge future 5.5 There is a small limitation of split that does not clean up its working directory on failure otherwise all is fine.
author Pierre-Yves David <pierre-yves.david@ens-lyon.org>
date Fri, 28 Oct 2016 16:59:32 +0200
parents dd6f090b7342 343298df3f26
children bc590681de77 ad04f3c3b1a9
comparison
equal deleted inserted replaced
1707:981d895d69cf 1750:1dbb8fdb725a
175 recreate:[12] newer a 175 recreate:[12] newer a
176 atop:[8] newer a 176 atop:[8] newer a
177 perform evolve? [Ny] y 177 perform evolve? [Ny] y
178 rebasing to destination parent: 66719795a494 178 rebasing to destination parent: 66719795a494
179 computing new diff 179 computing new diff
180 committed as (a7cabd7bd9c2|671b9d7eeaec) (re) 180 committed as c2c1151aa854
181 working directory is now at (a7cabd7bd9c2|671b9d7eeaec) (re) 181 working directory is now at c2c1151aa854
182 $ glog 182 $ glog
183 @ 14:(a7cabd7bd9c2|671b9d7eeaec)@default\(draft\) bk:\[\] bumped update to 1cf0aacfd363: (re) 183 @ 14:c2c1151aa854@default(draft) bk:[] bumped update to 1cf0aacfd363:
184 | 184 |
185 | o 9:7bc2f5967f5e@default(draft) bk:[] add c 185 | o 9:7bc2f5967f5e@default(draft) bk:[] add c
186 | | 186 | |
187 o | 8:1cf0aacfd363@default(public) bk:[] newer a 187 o | 8:1cf0aacfd363@default(public) bk:[] newer a
188 |/ 188 |/