Mercurial > evolve

comparison tests/test-stabilize-order.t @ 2834:38db1466c6fb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
log: unstable was renamed into orphan Unstable was renamed into orphan, update tests. Match 03039ff3082b mercurial changeset.
author Boris Feld <boris.feld@octobus.net>
date Thu, 10 Aug 2017 17:37:31 +0200
parents 08a64770ed24
children 66796d7b5415
comparison
equal deleted inserted replaced
2833:08a64770ed24 2834:38db1466c6fb
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 @@ -3,3 +3,4 @@
113 93418d2c0979643ad446f621195e78720edb05b4 005fe5914f78e8bc64c7eba28117b0b1fa210d0d 0 (*) {'ef1': '*', 'user': 'test'} (glob) 113 93418d2c0979643ad446f621195e78720edb05b4 005fe5914f78e8bc64c7eba28117b0b1fa210d0d 0 (*) {'ef1': '8', 'user': 'test'} (glob)
114 7a7d76dc97c57751de9e80f61ed2a639bd03cd24 0 {93418d2c0979643ad446f621195e78720edb05b4} (*) {'ef1': '*', 'user': 'test'} (glob) 114 7a7d76dc97c57751de9e80f61ed2a639bd03cd24 0 {93418d2c0979643ad446f621195e78720edb05b4} (*) {'ef1': '0', 'user': 'test'} (glob)
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
151 151
152 $ hg up 9 152 $ hg up 9
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 unstable 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:[9] addc
160 atop:[11] addb 160 atop:[11] addb
161 hg rebase -r 0f691739f917 -d 7a68bc4596ea 161 hg rebase -r 0f691739f917 -d 7a68bc4596ea
177 o 7:005fe5914f78@default(draft) adda 177 o 7: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 unstable changesets to evolve 182 no orphan changesets to evolve
183 [1] 183 [1]
184 184
185 Ambiguous evolution 185 Ambiguous evolution
186 $ echo a > k 186 $ echo a > k
187 $ hg add k 187 $ hg add k
206 | 206 |
207 | o changeset: 14:fa68011f392e 207 | o changeset: 14:fa68011f392e
208 | | parent: 12:2256dae6521f 208 | | parent: 12: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 | | instability: unstable 211 | | instability: orphan
212 | | summary: secondambiguous 212 | | summary: secondambiguous
213 | | 213 | |
214 | | o changeset: 13:bdc003b6eec2 214 | | o changeset: 13: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 | | instability: unstable 217 | | instability: orphan
218 | | summary: firstambiguous 218 | | summary: firstambiguous
219 | | 219 | |
220 | x changeset: 12:2256dae6521f 220 | x changeset: 12: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