Mercurial > hg
comparison tests/test-sparse-merges.t @ 33293:c9cbf4de27ba
sparse: rename command to debugsparse
Sparse checkout is still highly experimental and not protected
by BC guarantees yet. We also haven't had a discussion on the UX.
To discourage use, we rename the sparse command to debugsparse.
author | Gregory Szorc <gregory.szorc@gmail.com> |
---|---|
date | Sat, 01 Jul 2017 10:29:27 -0700 |
parents | abd7dedbaa36 |
children | 91c405f84cf7 |
comparison
equal
deleted
inserted
replaced
33292:1e9fd2c35ae3 | 33293:c9cbf4de27ba |
---|---|
17 (branches are permanent and global, did you want a bookmark?) | 17 (branches are permanent and global, did you want a bookmark?) |
18 $ echo bar2 >> bar | 18 $ echo bar2 >> bar |
19 $ hg commit -m 'feature - bar2' | 19 $ hg commit -m 'feature - bar2' |
20 | 20 |
21 $ hg update -q default | 21 $ hg update -q default |
22 $ hg sparse --exclude 'bar**' | 22 $ hg debugsparse --exclude 'bar**' |
23 | 23 |
24 $ hg merge feature | 24 $ hg merge feature |
25 temporarily included 1 file(s) in the sparse checkout for merging | 25 temporarily included 1 file(s) in the sparse checkout for merging |
26 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 26 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
27 (branch merge, don't forget to commit) | 27 (branch merge, don't forget to commit) |
53 $ hg up -q feature | 53 $ hg up -q feature |
54 $ touch branchonly | 54 $ touch branchonly |
55 $ hg ci -Aqm 'add branchonly' | 55 $ hg ci -Aqm 'add branchonly' |
56 | 56 |
57 $ hg up -q default | 57 $ hg up -q default |
58 $ hg sparse -X branchonly | 58 $ hg debugsparse -X branchonly |
59 $ hg merge feature | 59 $ hg merge feature |
60 temporarily included 2 file(s) in the sparse checkout for merging | 60 temporarily included 2 file(s) in the sparse checkout for merging |
61 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | 61 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
62 (branch merge, don't forget to commit) | 62 (branch merge, don't forget to commit) |