checkout from neighbour branch undeletes a path?

2012-11-13 Thread Peter Vereshagin
Hello. Am wondering if 'checkout branch path' undeletes the files? For the example below I'd like the 'file00.txt' to be deleted and never checked out from the previous branch... How can I do that? $ git init

Re: checkout from neighbour branch undeletes a path?

2012-11-13 Thread Junio C Hamano
Peter Vereshagin pe...@vereshagin.org writes: Am wondering if 'checkout branch path' undeletes the files? git checkout branch path (by the way, branch does not have to be a branch name; any commit object name would do, like git checkout HEAD^^ hello.c) is a way to check out named path(s) out of

Re: checkout from neighbour branch undeletes a path?

2012-11-13 Thread Peter Vereshagin
Hello. 2012/11/13 08:43:31 -0800 Junio C Hamano gits...@pobox.com = To Peter Vereshagin : JCH Peter Vereshagin pe...@vereshagin.org writes: JCH JCH Am wondering if 'checkout branch path' undeletes the files? JCH JCH git checkout branch path (by the way, branch does not have to be JCH a branch

Re: checkout from neighbour branch undeletes a path?

2012-11-13 Thread Junio C Hamano
Peter Vereshagin pe...@vereshagin.org writes: $ rm -r pathdir $ git checkout branch00 pathdir $ find pathdir/ pathdir/ pathdir/file00.txt pathdir/file01.txt $ Hasn't this been fixed at 0a1283b (checkout $tree $path: do not clobber local changes in $path not in $tree,