58 $ hg debugsparse -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) |
|
63 |
|
64 $ cd .. |
|
65 |
|
66 Tests merging a file which is modified in one branch and deleted in another and |
|
67 file is excluded from sparse checkout |
|
68 |
|
69 $ hg init ytest |
|
70 $ cd ytest |
|
71 $ echo "syntax: glob" >> .hgignore |
|
72 $ echo "*.orig" >> .hgignore |
|
73 $ hg ci -Aqm "added .hgignore" |
|
74 $ for ch in a d; do echo foo > $ch; hg ci -Aqm "added "$ch; done; |
|
75 $ cat >> .hg/hgrc <<EOF |
|
76 > [alias] |
|
77 > glog = log -GT "{rev}:{node|short} {desc}" |
|
78 > [extensions] |
|
79 > sparse = |
|
80 > EOF |
|
81 |
|
82 $ hg glog |
|
83 @ 2:f29feff37cfc added d |
|
84 | |
|
85 o 1:617125d27d6b added a |
|
86 | |
|
87 o 0:53f3774ed939 added .hgignore |
|
88 |
|
89 $ hg rm d |
|
90 $ hg ci -m "removed d" |
|
91 |
|
92 $ hg up '.^' |
|
93 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
94 $ hg debugsparse --reset |
|
95 $ echo bar >> d |
|
96 $ hg ci -Am "added bar to d" |
|
97 created new head |
|
98 |
|
99 $ hg glog |
|
100 @ 4:6527874a90e4 added bar to d |
|
101 | |
|
102 | o 3:372c8558de45 removed d |
|
103 |/ |
|
104 o 2:f29feff37cfc added d |
|
105 | |
|
106 o 1:617125d27d6b added a |
|
107 | |
|
108 o 0:53f3774ed939 added .hgignore |
|
109 |
|
110 $ hg debugsparse --exclude "d" |
|
111 $ ls |
|
112 a |
|
113 |
|
114 $ hg merge |
|
115 abort: $ENOENT$: '$TESTTMP/ytest/d' |
|
116 [255] |