SemanticMerge Now Speaks Java

Wednesday, May 29, 2013 Pablo Santos news , semanticmerge 0 Comments

Here we go! SemanticMerge now supports Java so we welcome all the Java developers: a wide range (from enterprise to Android, web to devices!) and a huge number according to the Tiobe report.

So go and visit our SemanticMerge meets Java site and grab a copy!

New Java support

Semantic now supports Java and we’ve also included new examples so that you can try it immediately. All the configuration documentation is ok but consider you’ve to specify Java as language with the -l=java param.

New editor

Even if you’re using C# or Vb.net you’ll greatly benefit from this new version because we’ve replaced the old textbox with a much better one that includes better syntax highlight, undo/redo, zoom (press CTRL and the wheel), code folding and many more.

Enjoy

Pablo Santos

I'm the CTO and Founder at Códice.
I've been leading Plastic SCM since 2005. My passion is helping teams work better through version control.
I had the opportunity to see teams from many different industries at work while I helped them improving their version control practices.
I really enjoy teaching (I've been a University professor for 6+ years) and sharing my experience in talks and articles.
And I love simple code. You can reach me at @psluaces.

Plastic SCM 4.1.10.443 External Release is out!!

Monday, May 27, 2013 Luix 0 Comments

Plastic SCM 4.1.10.440 (Zagreb) is available now!

See the full list of changes is here. You can visit the Plastic SCM download page to install or upgrade your Plastic SCM setup.

You can suggest and vote new features on the Plastic SCM Forum page and tell us your opinion about Plastic SCM or use the User's Voice channel, as well.

I'm glad to tell you that there are lots of new issues and bugfixes suggested by you, dear users, in this release:

New

 Branch Explorer (from the user voice): A new configuration option has been added to display the changeset arrows from parent to children (just the opposite to the default behaviour). To configure this, add this line in the branchexplorer.cfg file:

display.options.show_parent_to_child_arrows=true

Command line client: We've added a new command: "switch", which is an alias of "switchtobranch" or "stb". You can use it to switch your workspace to a branch, a label or a changeset. To switch to a label or changeset, you need to specify the label or changeset specification: lb:name, cs:number, or use the --label=name / --changeset=number parameters.

The following are some examples:

cm switch br:/main/HotFix-237@docu@atenea:8087

Switch to branch "/main/HotFix-237" on "docu" repository at "atenea:8087" server

cm switch /main/HotFix-237

Switch to branch "/main/HotFix-237" on default repository and server (*).

cm switch lb:Rel1.1

Switch to label "Rel1.1" on default repository and server (*).

cm switch cs:4375

Switch to changeset number "4375" on default repository and server (*).

(*) The working directory where this command is executed must be located within a valid Plastic SCM workspace. The default repository is the workspace selector repository, and the default server is the configured server to work with the Plastic SCM client.

Command line client: The "update" command now  accepts a new parameter: --last. This parameter alows updating the workspace to a branch configuration. This is intended to selectors that are configured to use changesets or labels and the user wants to load the latest changeset (a.k.a the head) of the branch that those objets belong to.
Example:

Say that the selector is like this:
repository "codice@diana:9095"
  path "/"
    changeset "464132"

And the changeset 464132 is located in the branch /main/PRE-PRODUCTION-4223/task-23434.

Now, if you execute:

cm update --last

Then the workspace will load the contents of the branch /main/PRE-PRODUCTION-4223/task-23434, and your selector will look like the following:

repository "codice@diana:9095"
  path "/"
    smartbranch "/main/PRE-PRODUCTION-4223/task-23434"

Bugfixes

GUI: The close workspace button has been moved a little bit to the left so it doesn't collide with the left side of the tab border.

Diff branch: This action in the branch context menu and in the Code Review was showing the diff with previous revision instead of the diff of the file in the entire branch. This is now fixed.

Team City: Several issues fixed here:

• Fixed an issue when retrieving the file differences of a past build. The contents of the revisions in the diff view were not being displayed. Nevertheless, there's still an issue when the file differences include a file that has been moved and its content has been changed: the contents of the "moved from" revision are not displayed.
• Fixed an issue when creating a patch that involved a change on a symlink. The diff command used in the plugin was unable to parse the "symlink" filetype. In addition to that, removed an extra whitespace when executing a command line "cm diff" command that involves printing the diff status of involved items.
  Example (before, "*" means a whitespace):
  $cm diff cs:1 cs:2
  D**foo.c A**m.c
  cm diff cs:1 cs:2 --added *m.c
  Now:
  $cm diff cs:1 cs:2
  D*foo.c A*m.c
  $cm diff cs:1 cs:2 --added
  m.c

Plastic SCM 4.1.10.440 External Release is out!!

Monday, May 20, 2013 Luix 0 Comments

Plastic SCM 4.1.10.440 (Kiev) is published now!

Take a look at the full list of changes is here. Visit the Plastic SCM download page to install or upgrade your Plastic SCM setup.

You can suggest and vote new features on the Plastic SCM Forum page and tell us your opinion about Plastic SCM or use the User's Voice channel, as well.

Let's see what's new in this release:

Bugfixes

• When a local move was applied, the operation may fail showing an improper message: "Selector can't locate a revision for the item...". This issue was happenning because the local moves were not taken into account properly as depedencies. Now this is fixed.
• Fixed some issues when using Plastic SCM with Mono 3.0. This version is not provided in our installer, but it's good to know that if you want to use it, now you can, and it should work like a champ.
• Merge: An error was thrown when running a merge on Windows platforms that implied changing the contents of a symlink. This is now fixed.
• Checkin: When this operation was performed from the GUI and there were not only small files implied (> 4Mb), the progress was not updated correctly for those files. Plastic SCM should show an additional progress for those files, but it didn't. Fixed.

Enjoy!

2000 checkins per minute and counting

Thursday, May 16, 2013 Pablo Santos performance , testing 0 Comments

Do you want to know how Plastic SCM performs under really heavy load? If you’re a Plastic enthusiast or just want to learn about the product… then keep on reading.

Why are we so obsessed with performance and scalability?

Version control performance is a critical point for lots of software teams out there. It is not restricted to a single industry: you can have big teams with big projects in aerospace, game dev, finance, telecom and many more. And the thing is that sometimes they can’t work in a distributed fashion, so they put a big burden on the version control server shoulders...

That’s why we regularly run load tests in Amazon to simulate lots of version control users putting a huge load on a single server… And this time we’re going through a quite interesting scenario: how does the server react when it is under a 2000 checkins per minute load?

Pablo Santos

I'm the CTO and Founder at Códice.
I've been leading Plastic SCM since 2005. My passion is helping teams work better through version control.
I had the opportunity to see teams from many different industries at work while I helped them improving their version control practices.
I really enjoy teaching (I've been a University professor for 6+ years) and sharing my experience in talks and articles.
And I love simple code. You can reach me at @psluaces.

Plastic SCM 4.1.10.436 External Release is out!!

Tuesday, May 14, 2013 Luix 0 Comments

Plastic SCM 4.1.10.436 (Bombay) is available now!

The full list of changes is here. Visit the Plastic SCM download page to install or upgrade your Plastic SCM setup.

You can suggest and vote new features on the Plastic SCM Forum page and tell us your opinion about Plastic SCM or use the User's Voice channel, as well.

Let's move on to the meat ;-)

New

Closable wokspace tabs: This feature has been suggested by lots of users and now it's available!

Take into account that you won't be allowed to close the latest workspace. This is because a workspace at least is necessary to work with Plastic SCM GUI.

To make a closed workspace visible again, you need to open the workspaces view and make that workspace active:

Bugfixes

Switching to a workspace that contained multiple opened views with a SEID condition (such as owner='me') could lead to a "Item has already been added" error. This concurrency but minor issue has been fixed.


Enjoy!

New version of SemanticMerge is out - 0.9.22

Thursday, May 09, 2013 Pablo Santos semanticmerge 0 Comments

Here we go again with a new release of SemanticMerge, the merge tool that understands your code (and maybe reads your mind too :P).

While we work on the next major release we’ve finished a few small but important changes ready to be published on our weekly version (I should better say the next two major releases since we’re already working on the biggest request on user voice :-O).

Let’s see what’s new on SemanticMerge 0.9.22.

Update system with built-in release notes

Yes, now when a new upgrade is ready, the upgrade window will show you what is new...

We’ve also added a --nocheckupdates flag so that you can avoid looking for fantastic updates... just in case.

If you decide to “update” then once you launch the tool you’ll see something like the following on the bottom right corner.

And once the download is finished it will give you instructions to restart:

We think the built-in update system will save precious time and will help all users staying up-to-date with the new versions.

SemanticMerge issue with “not valid license” message

Last week we launched support for Vb.net and since then some people experienced the following error: starting the diff tool they started to get a “not valid license” error message.

In fact the error was not really related to the Vb.net release but to the fact that the diff tool is not able to “request a new license” and that some people downloaded this new version just 15 days after downloading the first one, exactly when the built-in trial expired (Vb.net was launched 15 days after the initial c# launch).

Well, now it is fortunately fixed!

Encoding lost saving the result file

This is one of the bugs fixed on this release. There were issues keeping the encoding on the result file and it has been fixed now.

Fixed issues in conflict resolution

When conflicts had dependencies, there were issues solving them due to an internal cache update. It has been fixed too.

Next steps

We’re working on a number of features right now. We’re getting closer to release Java support, which is going to be the next big launch. We expect it to get really big since Java is one of the most widely used programming languages.

We’re also working on Mac OS X support. We guess we’ll need to add good Javascript support too in order to make the Mac OS X version really usable, and JS is top 3 request in uservoice as I write this.

But, we also think adding Mac OS X support will be great for all the Xamarin Studio users getting advantage of C# to develop for Mac, iPhone and even Android! :-). So let’s see what we can do to have it ASAP. We will be using the SemanticMerge Mac OS X development as test field for the upcoming Plastic SCM GUI for the Mac. We will be publishing the drafts of the Mac OS X Semantic Merge GUI soon, so you can give us early feedback.

The top 2 request is support for Linux so I’d love user feedback on your favorite GUIs for Linux.

We also need to move fast to support C, C++ (I guess we’ll be able to have C support earlier than C++ since it is simpler) and later Objective-C, but it will take a little bit longer.

We’d like to finish some proof of concept of “multi-file” SemanticMerge, which is also one of the super big features to come, but right now we’re fully booked. Remember we’re also releasing new Plastic SCM versions regularly each time ready for bigger and more complex companies.

Of course: we will be releasing support for fully automated SemanticMerge soon (not having to answer any questions if the merge can be automatically solved, as an option).

And one final note: we’re working on an astonishing “semantic visual diff” which will be able to render the differences visually, to better understand what is going on with your really complex refactors!

Social bar

Many of you have noticed we added a “social bar” to the SemanticMerge GUI. The goal is to help us (in fact help you helping us!) spread SemanticMerge so it reaches a wider number of users. It hasn’t been successful so far although people twits about SemanticMerge really often, but not using the tool.

Do you think it would make sense to add some sort of request to tweet when you finish a very complex merge?

Download

If you’re already using SemanticMerge the update dialog should show up the next time you run it. If not, don’t forget to visit www.semanticmerge.com.

Pablo Santos

I'm the CTO and Founder at Códice.
I've been leading Plastic SCM since 2005. My passion is helping teams work better through version control.
I had the opportunity to see teams from many different industries at work while I helped them improving their version control practices.
I really enjoy teaching (I've been a University professor for 6+ years) and sharing my experience in talks and articles.
And I love simple code. You can reach me at @psluaces.

dotNetRocks and all things semantic!

Thursday, May 09, 2013 Pablo Santos news 0 Comments

I'm glad to announce our latest media appearance... :-) this time in .Net Rocks!

We talked about branch per task, distributed version control, a little bit about motorbikes :-) and then discussed the Semantic Merge launch!

Enjoy!

Pablo Santos

I'm the CTO and Founder at Códice.
I've been leading Plastic SCM since 2005. My passion is helping teams work better through version control.
I had the opportunity to see teams from many different industries at work while I helped them improving their version control practices.
I really enjoy teaching (I've been a University professor for 6+ years) and sharing my experience in talks and articles.
And I love simple code. You can reach me at @psluaces.

Plastic SCM 4.1.10.434 External Release is out!!

Monday, May 06, 2013 Luix 0 Comments

Plastic SCM 4.1.10.434 (Bangkok) is already public!

Get the full list of changes here. Visit the Plastic SCM download page to install or upgrade your Plastic SCM client / server setup.

You also can suggest and vote new features on the Plastic SCM Forum page and tell us your opinion about Plastic SCM or use the User's Voice channel, as well.

Let's review what's new this week. Several of them are related to the command line tool, "cm.exe".

New

Merge + cloaked: Now the merge operation can be performed when there are cloaked items        involved on it even when the cloaked items have been locally deleted or changed.

Bugfixes

Checkin operation: Some checkin operation issues have been fixed:

•         Checkin + exclusive checkout (lock) involved: When a copied item that was locally changed and locked was commited, a new revision was created skipping the lock.
•         Checkin + local changes preference disabled: When a moved item that was locally changed was committed without considering the local change, then the local change was not detected. 

Revision specifications in the command line: The revision specification for an item inside an xlink did not work properly when there were multiple xlinks configured in the workspace.
Well, some commands help have been updated to reflect the revision specification of Plastic SCM 4.2.



Merge: When a merge operation contained a directory conflict and an  added writable xlink, the content inside the xlink was not applied and the merge did not finished.



Labelling from the command line:

• If you tried to label outside a workspace, the command failed.
• If the full specification of the changeset was not provided, the operation failed.
• If some problem happened labeling in the server, a null was retrieved.

In addition to that:

• Now, if the changeset full spec is not provided we assume the spec (repository) of the label.
• Now, if the label full spec is not provided we assume the spec (repository) of the changeset or path.
• If no path are provided, assume current path (workspace).

Let's see some examples:

#1
A) cm label lb:BL001
B) cm label lb:BL001@default@myserver:8084

Executed inside a workspace it will label the current workspace with the label BL001
Actually, the changeset loaded in the workspace will be labelled with BL001.

-------------------------------------------------------

#2
A) cm label lb:BL001 cs:1
B) cm label lb:BL001@default@myserver:8084 cs:1
C) cm label lb:BL001 cs:1@default@myserver:8084
D) cm label lb:BL001@default@myserver:8084 cs:1@default@myserver:8084
Executed inside a workspace it will label the changeset specified in the repository specified by the label with the label BL001.
To make it work outside a workspace you need to use option B), C) or D)

-------------------------------------------------------

#3
A) cm label lb:BL001 C:\mywkspath
B) cm label lb:BL001@default@myserver:8084 C:\mywkspath

Executed inside a workspace it will label the specified workspace with the label BL001.
To make this work outside a workspace you need to use option B)
Actually, the changeset loaded in the workspace will be labelled with BL001.

It's worth to remark that this new behaviour doesn't affect the old one, but extend it in a more user friendly way.

Enjoy!

SemanticMerge now ready for VB.net

Thursday, May 02, 2013 Pablo Santos news , semanticmerge 1 Comments

We’re glad to announce a new release of SemanticMerge today: 0.9.21.

This new build is very special because we’re adding a new language: Visual Basic .net!!

So now SemanticMerge is able to deal with two languages C# and VB.net and more are coming.

New examples available

All the possible merge cases supported for C# are now ready for VB.net and in fact if you go to the “samples” subdirectory you’ll find a new collection of test cases ready to be tested just by “double clicking”:

And we added a couple of script files inside each example folder so you can directly double click and run. “samplesemanticmergetool” runs the semantic merge and “samplemergetool” runs the text based one so you can compare and see why “semantic” rocks :-)

A Visual Basic merge scenario

Look at the following scenario with concurrent changes made on a method that is also moved “divergently”:

This scenario will be hell for conventional text based merge tools but check how it looks like inside SemanticMerge.

Once the conflicts are solved, you can jump and rearrange the file too.

Webinar

Remember we run a webinar this week and you can access the video here:

Download

SemanticMerge beta is free so go to www.semanticmerge.com and grab a copy!

More new features on 0.9.21

Together with the support of Visual Basic .net this new release include the following improvements:

• Redesigned (and improved) “merge info” panel. It now displays all the available information (if specified by the invoker of the tool) such us the contributor paths, the symbolic names (aliases you can use from the scm), owner, branch information, changeset and comment (if sent by the scm).
• The unmatch button was not able to deal with “moves out of scope” which means “methods (or any other element) move from one class to a different one (one container to another)”. It is now able to deal with it. It means that if the tool wrongly detected a move, you can unmatch and match again with the right one.
• Added a “diff button” for the “added-added” conflicts so that you can now compare the two contributors directly which is very useful (especially if you’re not using an external 2-way merge text-based tool).
• SemanticDiff now accepts symbolic names, which means you can send meaningful info from the scm (instead of the temporary files the scm will use for diffing and so on).
• The update window has been improved so starting on the next upgrade whenever an update is detected it will show the current version number, the one to be updated to, release notes (finally!) and even a link to the new installer (just in case you want to run a full installation).

Pablo Santos

I'm the CTO and Founder at Códice.
I've been leading Plastic SCM since 2005. My passion is helping teams work better through version control.
I had the opportunity to see teams from many different industries at work while I helped them improving their version control practices.
I really enjoy teaching (I've been a University professor for 6+ years) and sharing my experience in talks and articles.
And I love simple code. You can reach me at @psluaces.