Community
Participate
Working Groups
The synchronize view is currently not able to support changesets. This is very handy to see changes by commit and not only by file. See http://tasktop.com/blog/wp-content/uploads/2010/01/overridefadednohighlight.png
I've plan add commit change set in third iteration. Currently only first iteration is published, and I'm working on second one. I hope to move to this task in next few days (maybe a weak or two).
Created attachment 175533 [details] preliminary egit synchornization change set support This screen shot describes situation: __C / A--B \__D When we compare branches C and D. Currently only commits that are associated with C and D are visible, common ancestor commit isn't included in comparison.
I've attached a preview of current state of my work. In my humble opinion right now is a good time to discuss how change set should behave and what data should be included ... and maybe add some art work for graphical representation for commits (right now I use images form history view). Currently I see three points to discuss: * should we include common ancestor commit in list of commits? * how we should represent resources inside commit node? for example java packages should be handled as java pacges in package explorer or rather like regular folders * what about merge, commit, "overwrite" actions, should we add support for them here, if yes how it should look like? I'm open for any hints, suggestions and ideas ;)
(In reply to comment #3) > * should we include common ancestor commit in list of commits? Please correct me if I'm wrong, but isn't the common ancestor commit (called B in comment 2) available in both C and D? If so, what's the reason to show it when sync'ing C and D? I guess this part is in sync if we talk about these two branches. > * how we should represent resources inside commit node? for example java > packages should be handled as java pacges in package explorer or rather like > regular folders I'm afraid mixing change sets and different models (Workspace, Java Workspace) at the same time could be challenging. In CVS we use Resource Model content provider to display changes inside a change set.
I've pushed change set that solves this issue: http://egit.eclipse.org/r/#change,1247
I created a CQ for Dariusz's changes... https://dev.eclipse.org/ipzilla/show_bug.cgi?id=4400 Dariusz could you make the necessary confirmations for the IP review as a comment to this bug: a. authored 100% b. has the rights to donate the content to Eclipse c. contributes the content under the EPL
(In reply to comment #6) > Dariusz could you make the necessary confirmations for the IP review as a > comment to this bug: > > a. authored 100% Not exactly. In SynchronizeWithActionHandler I've reuse some already existing Eclipse's code, but this is clearly marked in java file. In case of rest code, I'm a 100% author. > b. has the rights to donate the content to Eclipse I have a full right for my code and I'm donating it to Eclipse. > c. contributes the content under the EPL Yes, content is contributed under EPL
Created attachment 176329 [details] Example for http://egit.eclipse.org/r/#change,1269 This screenshot is used for discussion of http://egit.eclipse.org/r/#change,1269.
Created attachment 176330 [details] Second example for http://egit.eclipse.org/r/#change,1269
Fixed with c5e296c4ef629c948958b0f03b11e1e97af1bb30. Thanks everyone for making this happen! Let's iron out any last issues for 0.9 by doing some testing!
