| Re: [cdt-dev] CDT git update |
|
And more good news. I’ve added the bin directories where the plug-in build results go into the .gitignore file and that seems to speed things up significantly.
I’ve pushed that to the cdt.git test3 repo if anyone wants to try it.
From: cdt-dev-bounces@xxxxxxxxxxx [mailto:cdt-dev-bounces@xxxxxxxxxxx]
On Behalf Of Schaefer, Doug OK, I have merge and conflict resolution working. When reading the EGit user doc, pay careful attention to where it tells you to Add the file that was in conflict.
Add basically tells git to recognize that the file has changed on purpose and to prepare for it to get checked in. If you don’t have conflicts, BTW, merge works fine. So I think that’s it unless anyone has something. Doug.
From: cdt-dev-bounces@xxxxxxxxxxx [mailto:cdt-dev-bounces@xxxxxxxxxxx]
On Behalf Of Schaefer, Doug BTW, the EGit user documentation is actually pretty good and documents all the workflows we care about. Please take a look. Thanks, Doug. From: cdt-dev-bounces@xxxxxxxxxxx [mailto:cdt-dev-bounces@xxxxxxxxxxx]
On Behalf Of Schaefer, Doug Agreed. I’m documenting the workflows to avoid using the Synchronized view because of this. From: cdt-dev-bounces@xxxxxxxxxxx [mailto:cdt-dev-bounces@xxxxxxxxxxx]
On Behalf Of Andrew Gvozdev Hi Doug, This is not really a blocker for me anymore, but we need to improve performance of Synchronize View as well - in particular synchronizing uncommitted changes with index locally - see bug
323839. It appears that the problem is not identical to Commit performance as Synchronize is visibly slower than commit. Thanks, Andrew On Mon, Jun 20, 2011 at 11:44 AM, Schaefer, Doug <Doug.Schaefer@xxxxxxxxxxxxx> wrote: Hey gang, I’ve figured out the patch workflow. Turning on the “git patch” option produces patches that will work with our repo structure. I’ll produce a video showing that off this afternoon. The egit gang are looking at the performance issue and have a solution they’re working on. The delays are annoying but don’t block any of our mandatory workflows. The final workflow I’m trying to figure out is merge conflict resolution. I’ll work on that today. If I can get that together, I’ll give my green light for the move. The greater Eclipse community has a close eye on us and I am getting a lot of help to try and ensure we have a good experience. There is clear momentum to get all Eclipse projects
onto git as soon as possible. So the good news is that we aren’t alone in this adventure.
J If you find any blockers, please let me know ASAP and I’ll try and get them addressed. Thanks, Doug.
|