[
Date Prev][
Date Next][
Thread Prev][
Thread Next][
Date Index][
Thread Index]
[
List Home]
|
Re: [mdt-ocl.dev] GIT Practice
|
Hi Ed,
Branch names
-------------------
Axel has used bugs/nnnn. I've used bug/nnn. We need to standardize. I
thought one of the GIT tutorials had a recommendation but can't find it.
interestingly, I can't find it anymore either. I have no specific
preference. We can rename as you suggest. I'll rename my branches to
bug/nnn, push and delete the old branch tags if the Eclipse git policies
allow me to do so.
Presumably the branches get renamed/deleted after push otherwise the
remote tracking will become unmanageable.
Hopefully not after push. We may discuss whether to delete after merging
into master. By and large I wouldn't have an issue with them remaining
in the repository for later reference. You may untrack individual branches.
Should we rename historic branches to have hierarchy: e.g. maintenance/3.0?
Feel free :-)
Bugzilla status
--------------------
I think anyone can commit to a bug branch at any time. Eventually the
bug branch is submitted for review as a result of which +1's authorize
push to master and consequently RESOLVED. cf
You mean "merge" into master. Pushing we hopefully do continuously to
show progress on the bug to the team and other interested parties.
https://bugs.eclipse.org/bugs/show_bug.cgi?id=348504 where my +1 seems
to have been interpreted as commit to bug branch which then got a
RESOLVED without a push to master.
No. 59edf48860a743ad7a21569e4d2d203b5f98b9bb was the commit on the
branch. After your +1 I "merged" into master, but that was a
fast-forward since no other changes had happened on master in between.
So git just moves the master tag to the bug(s)/348504 branch's tip.
SSH keys
-----------
Axel: I'm waiting for clarification on what keys you want me to put where.
I sent you two .pub keys. Not sure if as the project lead you have
access to my .ssh/authorized_keys directory on the git server. I don't.
This currently means I have to enter my password over and over again.
The bug links I sent document the problem.
Best,
-- Axel
Size
-----
I'm already finding GIT incredibly slow. The tutorials recommend small
repositories. I'm wondering if we should be partitioning.
Working Directory
-------------------------
EGIT seems to create a Working Directory and Eclipse seems to use it for
Import Projects, which puzzles me as regards switching branches. I
expect my Workspace files to be extra-repository, whereas GIT seems to
have them 'inside'. Has GIT/me done something stupid?
Regards
Ed
_______________________________________________
mdt-ocl.dev mailing list
mdt-ocl.dev@xxxxxxxxxxx
https://dev.eclipse.org/mailman/listinfo/mdt-ocl.dev
