Settings and activity
21 results found
-
3 votes
Piotr Mis
shared this idea
·
-
14 votesPiotr Mis
supported this idea
·
-
44 votesPiotr Mis
supported this idea
·
-
102 votesPiotr Mis
supported this idea
·
-
9 votesPiotr Mis
supported this idea
·
-
10 votesPiotr Mis
supported this idea
·
-
5 votes
An error occurred while saving the comment Piotr Mis
supported this idea
·
An error occurred while saving the comment Piotr Mis
commented
I personally would imagine this as kind of preprocessor.
You could list set of #defines and before semantic parse all defines would be replaced.
Imagine following example:
interrupt void int_handler(void);
To "semantic_c.conf" you could put:
#define interruptThan the code seen by semantic parser will look like:
void int_handler(void);Other example:
FUNC(void, AUTOMATIC) foo( VAR(uint8, AUTOMATIC) bar);put to semantic_c.conf:
#define FUNC(rettype, memclass) rettype
#define VAR(type, memclass) typeAnd voila:
final code will be seen as:
void foo( uint8 bar); -
12 votesPiotr Mis
supported this idea
·
-
1 votePiotr Mis
shared this idea
·
-
10 votesPiotr Mis
supported this idea
·
-
6 votesPiotr Mis
supported this idea
·
-
11 votesPiotr Mis
supported this idea
·
-
9 votes
An error occurred while saving the comment Piotr Mis
commented
I also see "History" and "History tree" pretty confusing.
Maybe at least blog post which would deeply explain all relations and markers on History tree?
-
14 votesPiotr Mis
supported this idea
·
An error occurred while saving the comment Piotr Mis
commented
I would propose to add it rather as sub-option of "Update workspace" button in "Item" tab.
This buton shall behave in the same way as "Check-in" button on "Pending changes".In this way you do not overload menus.
Generally I am downloading cloaked files during build preparation as they are changed and checked-in after build.
I recall that I have some problems when I did not uncloaked these files and tried to check-in new versions. -
6 votesPiotr Mis
supported this idea
·
An error occurred while saving the comment Piotr Mis
commented
Maybe just set of icons for left panel:
Previous/next revision globaly - it will just switch left panel to previous/next revision of file (whatever branch)
Previous/next revision in branch of currently displayed revision
Previous/next revision in branch of currently displayed revision in right panel file (this will work also for workspace comparison - in such case shall it will result in current workspace branch)Additionally I would add icon: "Select revision" after clicking which dialog window similar to the one displayed after choosing "Diff revision..." option from context menu in "Items" view.
This dialog could be two areas (like "Diff revision..." in which currently both revisions to compare can be chosen) or only one (if you plan to allow changing only left panel). This you could consider even if you do not add Prev/Next. It will save a lot of clicking what trying to compare historical revisions - now we always must go back to "History" or "Items" tab.I hope I described it in undarstandable way. If not please let me know I will try to be more clear.
-
6 votesPiotr Mis
supported this idea
·
-
6 votes
On the release 7.0.16.2077, we added the new server-side merge that extends the existing merge-to functionality.
Using the server-side merge, the file conflicts can be resolved and the merge resolution options (—mergetype, —keepsource & —keepdestination) are supported.
The server-side merge is still on preview so you need to enable it adding the following setting on the client.conf. Check how to do it on the release notes: https://www.plasticscm.com/download/releasenotes/7.0.16.2077
Remarks, the server and client version must be equal or newer than 7.0.16.2077 to use the server-side merge.
We comment option will be documented soon, we already plan a task to do it in the next few weeks. Sorry for the delay.
Best regards
Borja
An error occurred while saving the comment Piotr Mis
commented
As -c/-commentsfile are already supported you can discard and only improve help.
Regarding --mergetype. My understanding of this option was different (see discussion on forum: http://www.plasticscm.net/index.php?/topic/3025-merge-to-in-commandline/)
Just adding support of --mergetype during MergeTo is not needed. However it was adviced in mentioned thread to post idea here.
If it is possible to convert this one into: Add option in merge (regular and mergeto) to "only allow the merge if src/dst changes it" then I propose to convert.
If not possible then this one can be discarded and I will post new one.An error occurred while saving the comment Piotr Mis
commented
Just checked that -c and -commentsfile are supported.
They are only missing in help displayed after "cm merge --help"Piotr Mis
shared this idea
·
-
8 votesPiotr Mis
supported this idea
·
Piotr Mis
shared this idea
·
-
7 votesPiotr Mis
supported this idea
·
-
114 votesPiotr Mis
supported this idea
·
Alternative solution: set of regular expression rules for replace operation.