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.

Checkin changes to a different branch

Tuesday, December 04, 2012 Ma Nu 1 Comments

You have been working hard during all the afternoon, suddenly you realize that your workspace is not switched to the correct branch! The pending changes view is plenty of changes that should be committed in a different branch. How Plastic SCM can deal with this typical developer situation?.

Want to move your changes elsewhere?

You may know that we have two ways to avoid committing changes in the wrong branch.
The first one is the "Checkin changes to a different branch...", with this option you can commit your changes in a new branch, keeping the current one clean.

The second is the shelve operation, with this feature you can save the workspace changes in the Plastic SCM server and apply them later in any branch you want.

Check-in sub menu options

Already committed the changes?

If your changes are already committed in a wrong branch you can use the subtractive merge to "revert" the changes and keep the head branch as it was before committing the wrong changeset.

Now, the cherry pick merge is the key in order to place the changes to the right branch. Use the cherry pick to propagate the changeset content into the destination branch. Here you have an example of how the operation looks like:

Usage of the subtractive and cherry pick merge

The changeset #1 is the one we want to "move", the changeset #2 is the result of the subtractive merge (red merge link) and finally the changeset #3 is the the result of the cherrypick (purple merge link).

As you can see Plastic SCM has all the tools to save the day.

Manuel Lucio
I'm in charge of the Customer Support area.
I deal with complex setups, policies and working methodologies on a daily basis.
Prior to taking full responsibility of support, I worked as software engineer. I have been in charge of load testing for quite some time, so if you want to know how well Plastic compares to SVN or P4 under a really heavy load, I'm your guy.
I like to play with Arduino GPS devices, mountain biking and playing tennis.
You can find me hooked to my iPhone, skate-boarding or learning Korean... and also here @mrcatacroquer.

1 comment:

  1. Hey is there a command line command for checking in changes to a different branch?