equal
deleted
inserted
replaced
170 $ hg debugsparse --exclude "a" |
170 $ hg debugsparse --exclude "a" |
171 $ ls |
171 $ ls |
172 d |
172 d |
173 |
173 |
174 $ hg merge |
174 $ hg merge |
175 abort: $ENOENT$: $TESTTMP/mvtest/a |
175 temporarily included 1 file(s) in the sparse checkout for merging |
176 [255] |
176 merging a and amove to amove |
|
177 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
178 (branch merge, don't forget to commit) |
177 |
179 |
178 $ hg up -C 4 |
180 $ hg up -C 4 |
|
181 cleaned up 1 temporarily added file(s) from the sparse checkout |
179 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
182 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
180 |
183 |
181 $ hg merge |
184 $ hg merge |
182 merging amove and a to amove |
185 merging amove and a to amove |
183 abort: cannot add 'a' - it is outside the sparse checkout |
186 abort: cannot add 'a' - it is outside the sparse checkout |