Mercurial > hg
view tests/test-nested-repo.t @ 21537:1ab30e9ba0fc
update: specify custom conflict markers for update (BC)
Add custom conflict markers 'working copy' and 'destination' for doing hg update
when there are conflicts between your working copy and the destination.
author | Durham Goode <durham@fb.com> |
---|---|
date | Fri, 09 May 2014 18:09:11 -0700 |
parents | 4cdec37f0018 |
children | 4441705b7111 |
line wrap: on
line source
$ hg init a $ cd a $ hg init b $ echo x > b/x Should print nothing: $ hg add b $ hg st $ echo y > b/y $ hg st Should fail: $ hg st b/x abort: path 'b/x' is inside nested repo 'b' (glob) [255] $ hg add b/x abort: path 'b/x' is inside nested repo 'b' (glob) [255] Should fail: $ hg add b b/x abort: path 'b/x' is inside nested repo 'b' (glob) [255] $ hg st Should arguably print nothing: $ hg st b $ echo a > a $ hg ci -Ama a Should fail: $ hg mv a b abort: path 'b/a' is inside nested repo 'b' (glob) [255] $ hg st $ cd ..