Merge support just landed!
Jens Alfke
* There is a new Merge command that’s enabled when you’ve updated to a head revision, there are no uncommitted changes, and there’s one other head revision.
* The Pull command will helpfully inform you if the pull requires a merge, and will offer to run the merge.
* If there were file conflicts, the conflicted files will have a special icon in the list.
* There is a Mark Resolved command (in the Revisions menu) to mark a file as resolved after you’ve cleaned it up.
* Don’t forget to commit after resolving! To remind you, the window titlebar icon will change to the merge icon if the working tree is an uncommitted merge.
The toolbar icon for the Merge command is real, but the conflicted/resolved file icons are just some hacks that I derived from shrinking and color-swapping that icon. Hopefully someone can make real ones, but they’ll do for now :)
The version number is now 0.8, but I think this could use some more testing before we release a binary. Let me know if you find any problems.
—Jens
#171: 6aefe80b3dd962b66b29fffd0cd727905a86ed52
Date: April 10, 2010 2:13:42 PM PDT
By: Jens Alfke
Branch: default
* Added support for merging (fixes #7).
* Window title-bar icon indicates whether working tree is modified or a merge.
* Fixed: graph column wasn't updating in some cases where the list of revisions didn't change (fixes #77).
* Fixed: file status icons sometimes didn't update.
* Fixed: status sometimes wouldn't refresh after changes were noticed in the '.hg' directory.
* Fixed: directory-change watcher would miss changes that happened while a modal alert was onscreen. [This fix depends on a corresponding change in MYUtilities.]
* Fixed: localized strings never got updated because Localize.py wasn't running genstrings correctly.
* Bumped version to 0.8.