Who we are

We are the developers of Plastic SCM, a full version control stack (not a Git variant). We work on the strongest branching and merging you can find, and a core that doesn't cringe with huge binaries and repos. We also develop the GUIs, mergetools and everything needed to give you the full version control stack.

If you want to give it a try, download it from here.

We also code SemanticMerge, and the gmaster Git client.

Plastic SCM Release is out!

Monday, November 05, 2012 Amalia 0 Comments

Plastic SCM has been released
The features of each Plastic SCM release, up to and including the latest version, can be found in the release notes page.
As you know we're releasing a new version weekly (in fact we produce new versions on a daily basis). The last one we made public includes a few bug fixes you might be interested in:


Pending changes with merge info

The "pending changes" view adds more information about the merges in progress. Each file in Pending Changes coming from a merge is decorated with merge source information.

For instance, if a file "/src/foo.txt" is added on branch "main/task001" and later "main/task001 merged to main", the info in the pending changes view will be:

/src/foo.txt - Copied / Merged from 2

Where "2" is the number of source changeset.

This way, when you have several merges in progress, it is possible to know which files come from which merge.

Let's remember, the column status on a Merge can have the following values:

  • Replaced: means that a file was modified on the branch and, during merge, it simply replaces the old one being loaded on destination (there's no merge as such)
  • Copied: means that the file was added on the branch, so it is just "copied" into the destination.
  • Checked-out: when a file is checkedout and it comes from a merge, it means it has been merged (it was modified in parallel on both source and destination)

"Go to line” feature

Implemented a go to line (Shortcut: Ctrl+G) in the textbox, so that users can scroll directly to a certain line when working with Differences, Mergetool and Annotate.

This feature is only available from the textbox with numbered lines, and it works the same way as it works in Visual Studio or Notepad.

Let’s see an example:

User opens the Diff with previous view, for a certain item. Then he selects the textbox to search in: left one (parent revision) or right one (current revision). Now, right click and select "Go to line..." action or select the short cut “Crtl-G”. A windows dialog will show like in the following figure:

Let’s type a number between 1 and the total number of lines of the revision. Otherwise a warning message will show:

Now, you are going to click “OK” or press “Enter”. The textbox is automatically scrolled up or down to the desired line and the text is selected.


Review comments

There may be review comments or attribute realizations that are lost during the replication process, on some special bidirectional replications or replications that involve more than two repositories. Fixed!!

Merge-to: duplicated child with a moved on source

MergeTo can't use the TreeOperations because it doesn't support the changed nodes. If we used changed nodes we can have multiple nodes for the same item and we need to preserve multiple changes on the same item. So, the mergeTo issue "Can't add an entry with the same name." was related with multiple changes on the same item. Now, it has been fixed.

Undo change

The operation undo changes failed on a locally changed item or locally moved item:

  • With less than 100% of similarity
  • It's locked

Now, it's fixed.

Exclusive Checkout

Now the locked items inside a deleted item are properly released. Fixed!

Undo changed dialog before merge not refreshing

During merge, if the option "Find changed files in workspace before merge" is set, and there are changed files in the workspace, a dialog shows up warning about the situation. Now the dialog is properly refreshed if a subset of changes is undone.

Enjoy it!!

0 comentarios: