Re: [gentoo-dev] My masterplan for git migration (+ looking for infra to test it)

[Ian Stakenvicius]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

On 14/09/14 08:57 PM, Rich Freeman wrote:
> On Sun, Sep 14, 2014 at 7:21 PM, Patrick Lauer <patrick@g.o>
> wrote:
>>
>> iow, git doesn't allow people to work on more than one item at a
>> time?
>>
>> That'd mean I need half a dozen checkouts just to emulate cvs,
>> which somehow doesn't make much sense to me ...
>>
>
> Well, you can work on as many things as you like in git, but it
> doesn't keep track of what changes have to do with what things if
> you don't commit in-between.  So, you'll have a big list of changes
> in your index, and you'll have to pick-and-choose what you commit
> at any one time.
>
> If you really want to work on many things "at once" the better way
> to do it is to do a temporary branch per-thing, and when you
> switch between things you switch between branches, and then move
> into master things as they are done.
>
> I assume you mean working on things that will take a while to
> complete.  If you just want to do 15 standalone commits before you
> push you can do those sequentially easily enough.  A branch would
> be more appropriate for some kind of mini-project.
>
> You can work on branches without pushing those to the master repo.
> Or, if appropriate a project team might choose to push their branch
> to master, or to some other repo (like an overlay).  This would
> allow collaborative work on a large commit, with a quick final
> merge into the main tree.  That is the beauty of git - branches are
> really cheap. So are repositories - if somebody wants to do all
> their work in github and then push to the main tree, they can do
> that.
>

Actually i see what Patrick's getting at -- I have similar issues when
working with mozilla stuff.  if you're using local (temporary)
branches, the whole tree is in the state of that current checkout,
right?  IE, while I have my firefox-update branch active and working
for an 'ebuild ... install', I can't be doing work in my
'freewrl-update' branch unless I make multiple separate repo trees,
one for each independently-separate workflow i want to do concurrently.

Ideal here would be the ability to have separate active checkouts of a
repo on a per-shell basis, ie each shell invocation would be able to
work concurrently and distinctly on distinct branches; anyone done
that before?  Does git do it already?

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2

iF4EAREIAAYFAlQXJAAACgkQ2ugaI38ACPBREAD/YnsyY+fAK1TEXgzNYHBCq138
Q5Bj+J6pNGX8aBDjjHoA/iyy5CWxhyAYE3buSOXkEvFfhm/716DsQIptpX7JpS0m
=YrIG
-----END PGP SIGNATURE-----