Mercurial > evolve

comparison tests/test-unstable.t @ 3013:945a0989e41b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
packaging: merge stable back into default 6.7.0 has been released.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Wed, 27 Sep 2017 16:26:30 +0200
parents bd7e8be29542
children a867d59ea97a 28fb347a5bf8
comparison
equal deleted inserted replaced
3012:081070828703 3013:945a0989e41b
40 $ cd test1 40 $ cd test1
41 $ mkcommits _a _b _c 41 $ mkcommits _a _b _c
42 $ hg up "desc(_b)" 42 $ hg up "desc(_b)"
43 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 43 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
44 $ hg amend -m "bprime" 44 $ hg amend -m "bprime"
45 1 new unstable changesets 45 1 new orphan changesets
46 $ hg log -G 46 $ hg log -G
47 @ 3:36050226a9b9@default(draft) bprime 47 @ 3:36050226a9b9@default(draft) bprime
48 | 48 |
49 | o 2:102002290587@default(draft) add _c 49 | o 2:102002290587@default(draft) add _c
50 | | 50 | |
84 $ hg merge "desc(_a)" >/dev/null 84 $ hg merge "desc(_a)" >/dev/null
85 $ hg commit -m "merge" 85 $ hg commit -m "merge"
86 $ hg up "desc(_a)" 86 $ hg up "desc(_a)"
87 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 87 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
88 $ hg amend -m "aprime" 88 $ hg amend -m "aprime"
89 1 new unstable changesets 89 1 new orphan changesets
90 $ hg log -G 90 $ hg log -G
91 @ 4:47127ea62e5f@default(draft) aprime 91 @ 4:47127ea62e5f@default(draft) aprime
92 | 92 |
93 | o 3:6b4280e33286@default(draft) merge 93 | o 3:6b4280e33286@default(draft) merge
94 | |\ 94 | |\
132 $ hg merge "desc(_a)" >/dev/null 132 $ hg merge "desc(_a)" >/dev/null
133 $ hg commit -m "merge" 133 $ hg commit -m "merge"
134 $ hg up "desc(_a)" 134 $ hg up "desc(_a)"
135 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 135 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
136 $ hg amend -m "aprime" 136 $ hg amend -m "aprime"
137 1 new unstable changesets 137 1 new orphan changesets
138 $ hg up "desc(_c)" 138 $ hg up "desc(_c)"
139 1 files updated, 0 files merged, 1 files removed, 0 files unresolved 139 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
140 $ hg amend -m "cprime" 140 $ hg amend -m "cprime"
141 $ hg log -G 141 $ hg log -G
142 @ 5:2db39fda7e2f@default(draft) cprime 142 @ 5:2db39fda7e2f@default(draft) cprime
183 0 files updated, 0 files merged, 2 files removed, 0 files unresolved 183 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
184 $ mkcommits bprimesplit1 bprimesplit2 184 $ mkcommits bprimesplit1 bprimesplit2
185 created new head 185 created new head
186 $ hg prune "desc(_b)" -s "desc(bprimesplit1) + desc(bprimesplit2)" --split 186 $ hg prune "desc(_b)" -s "desc(bprimesplit1) + desc(bprimesplit2)" --split
187 1 changesets pruned 187 1 changesets pruned
188 1 new unstable changesets 188 1 new orphan changesets
189 $ hg log -G 189 $ hg log -G
190 @ 4:2a4ccc0bb20c@default(draft) add bprimesplit2 190 @ 4:2a4ccc0bb20c@default(draft) add bprimesplit2
191 | 191 |
192 o 3:8b87864bd0f4@default(draft) add bprimesplit1 192 o 3:8b87864bd0f4@default(draft) add bprimesplit1
193 | 193 |
228 0 files updated, 0 files merged, 2 files removed, 0 files unresolved 228 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
229 $ mkcommits bprimesplit1 bprimesplit2 229 $ mkcommits bprimesplit1 bprimesplit2
230 created new head 230 created new head
231 $ hg prune "desc(_b)" -s "desc(bprimesplit1) + desc(bprimesplit2)" --split 231 $ hg prune "desc(_b)" -s "desc(bprimesplit1) + desc(bprimesplit2)" --split
232 1 changesets pruned 232 1 changesets pruned
233 1 new unstable changesets 233 1 new orphan changesets
234 $ hg up "desc(_a)" 234 $ hg up "desc(_a)"
235 0 files updated, 0 files merged, 2 files removed, 0 files unresolved 235 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
236 $ mkcommits bsecondsplit1 bsecondsplit2 236 $ mkcommits bsecondsplit1 bsecondsplit2
237 created new head 237 created new head
238 $ hg prune "desc(bprimesplit1)" -s "desc(bsecondsplit2)" 238 $ hg prune "desc(bprimesplit1)" -s "desc(bsecondsplit2)"
239 1 changesets pruned 239 1 changesets pruned
240 1 new unstable changesets 240 1 new orphan changesets
241 $ hg prune "desc(bprimesplit2)" -s "desc(bsecondsplit1)" 241 $ hg prune "desc(bprimesplit2)" -s "desc(bsecondsplit1)"
242 1 changesets pruned 242 1 changesets pruned
243 $ hg log -G 243 $ hg log -G
244 @ 6:59b942dbda14@default(draft) add bsecondsplit2 244 @ 6:59b942dbda14@default(draft) add bsecondsplit2
245 | 245 |
286 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 286 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
287 $ mkcommit bprimesplit2 287 $ mkcommit bprimesplit2
288 created new head 288 created new head
289 $ hg prune "desc(_b)" -s "desc(bprimesplit1) + desc(bprimesplit2)" --split 289 $ hg prune "desc(_b)" -s "desc(bprimesplit1) + desc(bprimesplit2)" --split
290 1 changesets pruned 290 1 changesets pruned
291 1 new unstable changesets 291 1 new orphan changesets
292 $ hg log -G 292 $ hg log -G
293 @ 4:3c69ea6aa93e@default(draft) add bprimesplit2 293 @ 4:3c69ea6aa93e@default(draft) add bprimesplit2
294 | 294 |
295 | o 3:8b87864bd0f4@default(draft) add bprimesplit1 295 | o 3:8b87864bd0f4@default(draft) add bprimesplit1
296 |/ 296 |/