Re: gmock issues when switching Git branches

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Tue, 13 Dec 2016, Wido den Hollander wrote:
> Hi,
> 
> I've been seeing this multiple times when switching Git branches on git Git repo:
> 
> wido@wido-desktop:~/repos/ceph$ git branch
>   firefly
>   hammer
>   jewel
> * master
> wido@wido-desktop:~/repos/ceph$ git checkout jewel
> error: Updating the following directories would lose untracked files in it:
> 	src/gmock
> 
> Aborting
> wido@wido-desktop:~/repos/ceph$
> 
> The gmock submodule is often preventing me from switching branches.
> 
> Since I don't work with Git submodules that much I usually end up 
> removing the directory and going a submodule update.

That's what I do too.  :)  The problem is that the submodule structure 
changed after jewel.

> Is that the good way to go? And am I the only one running into this?

I just keep a separate checkout for jewel (and each other release), e.g. 

 git clone git@xxxxxxxxxx:ceph/ceph ceph.jewel
 git clone git@xxxxxxxxxx:ceph/ceph ceph.hammer

That reduces the amount of rebuilding I have to do (at the expense of disk 
space).

sage
--
To unsubscribe from this list: send the line "unsubscribe ceph-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html



[Index of Archives]     [CEPH Users]     [Ceph Large]     [Information on CEPH]     [Linux BTRFS]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]
  Powered by Linux