Versions Compared

Old Version 1

changes.mady.by.user Richard Bair

Saved on

compared with

New Version 2

changes.mady.by.user Richard Bair

Saved on

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.

...

The main window gives a quick view at a glance of the current state of affairs. The branch view shows the history of changes and merges that exist in the repo. You can easily see who has pushed what changsets. If you select a changeset within this view, the details of the changeset are shown below it, listing all the files, and the individual hunks that changed. For the current uncommitted changes, you can revert any hunk (not just an entire file!), and for committed changes you can reverse any hunk (or file), making it easy to back out some changes.

Image Modified

SourceTree also gives you a method for dealing with multiple concurrent changes (the problem we defined in <<Using Mercurial>> above). It is similar to the manual patch style, but using visual tools instead of managing it by hand.

First, we have a very simple project with a single file, Foo.txt. Our repo has a single change set where Foo.txt was created and its single line "First Foo".

Image Modified

We then modify the Foo.txt file. You can see that we've modified the first line to say "Second Foo".

Image Modified

We've now been interrupted and need to switch to another issue. First we select the "Shelve" toolbar button and name our shelved change set

Image Modified

The repo has now been reset to its normal state, and I am free to start working on my second issue, RT-5678. I then am interrupted again and have to switch back to rt-1234 in order to commit the work (perhaps a pending code review has now finished). So, as before, I shelve my changes.

Image Modified

Now I select the shelved rt-1234 and choose to unshelve it.

Image Modified

Mercurial with NetBeans

...

Most teams also setup JIRA Dashboards for monitoring the progress of a particular release. Some are also using JIRA tags on issues to indicate which "sprint" an issue is assigned to. These dashboards can be searched out by each user of JIRA and added to their home page.

Image Modified
Image Modified

By using JIRA effectively, and by using JIRA dashboards, it is possible for anybody to follow along with development of those issues they are most interested in, and to track the progress of the release and what work is going on now. We attempt to make sure that JIRA is the database of record, meaning that the most accurate up-to-date information is always kept in JIRA.