Settings and activity
31 results found
-
175 votes
An error occurred while saving the comment JakubH supported this idea ·An error occurred while saving the comment JakubH commentedI should mention that it means: allow resolve an evil twin conflict with merge.
JakubH shared this idea · -
105 votes
An error occurred while saving the comment JakubH commentedThis can be almost accomplished with triggers and attributes already. Not the status icons but at least the branch colors (conditional format) can be used.
-
46 votes
An error occurred while saving the comment JakubH commentedAs far as I know, the Plastic 5.0.44 has added the merges to a History as a 2D tree view, but it doesn't add it to History view and it doesn't take into account the reverts (Revert to this revision) in both views.
An error occurred while saving the comment JakubH commentedhttp://www.plasticscm.net/index.php?/topic/1291-some-ux-issues/?p=12646
History and History as 2D tree are very useful features. However, there is a problem with those views. They do not show the real history of changes of the item as user may expect. The history view is actually a list of all revisions of that file, which is not the same, because the same revision could be used more than once and in more places. I mean, when using Revert to this revision, an old revision is checked-in again, but this information is not shown in the “History” because no new revision has been made. Similarly, when there was a merge (or a cherry pick) between branches, a file change was copied to another branch, but you don’t see this important thing in “History”. Again: because no new revision of that file has been made. History as 2D tree has both of these limits too. This leads to a big confusion among users – see these links for instance:http://www.plasticscm.net/index.php?/topic/1741-merge-not-displayed-neither-in-file-history-nor-in-file-2d-history/
http://plasticscm.uservoice.com/forums/15467-general/suggestions/3950398-show-merges-in-file-history-and-2d-history (This suggestion is basically a subset of mine.)
http://www.plasticscm.net/index.php?/topic/1860-missing-file-history-entry-after-revert/
http://www.plasticscm.net/index.php?/topic/1939-file-revisions-and-tracking-them/So my suggestion is add all these information to History views two. Frankly, I don’t see any usecase where somebody doesn’t want to see it.
JakubH shared this idea · -
28 votesJakubH shared this idea ·
-
1 vote
An error occurred while saving the comment JakubH commentedI believe it has been fixed already.
-
14 votesJakubH supported this idea ·
An error occurred while saving the comment JakubH commentedSee also this: http://plasticscm.uservoice.com/forums/15467-general/suggestions/2675742-vs2010-plugin-add-ability-to-click-on-item-in-pen
Because the modality of the Pending Changes window makes some views opened from the context menu inaccessible. -
68 votes
An error occurred while saving the comment JakubH commentedUnfortunately, we use Visual C++ (or C++/CLI rarely). However, method history for C++ would be great. ;-)
Yeah, history of a selected line would be great too. It basically leads to my other (more general) suggestion here: http://plasticscm.uservoice.com/forums/15467-general/suggestions/2938098-interactive-file-history-annotation-
An error occurred while saving the comment JakubH commentedWhat is maybe more important here is the idea of launching Annotate from a Merge tool (and scrolling to the same line automatically). That is something what I need quite often when I am trying to resolve a conflict.
More on this here: http://www.plasticscm.net/index.php?/topic/1291-some-ux-issues/#entry8989JakubH supported this idea ·JakubH shared this idea · -
24 votesJakubH supported this idea ·
An error occurred while saving the comment JakubH commentedThere are also no context menus in this modal Pending changes dialog. The same problem is in an Windows Explorer extension too.
http://www.plasticscm.net/index.php?/topic/1291-some-ux-issues/#entry10137 -
93 votesJakubH supported this idea ·
-
31 votesJakubH supported this idea ·JakubH shared this idea ·
-
28 votesJakubH supported this idea ·JakubH shared this idea ·
I have found another case where this would be needed – for an "Item loaded twice conflict" after cherry-pick with an added item: http://www.plasticscm.net/index.php?/topic/2118-item-loaded-twice-conflict/