| Fri, 03 Dec 2010 19:35:04 +0000 |
Chris Cannam |
* First cut of work on merge/resolve logic
|
| Fri, 03 Dec 2010 14:43:32 +0000 |
Chris Cannam |
* Better handling of empty repositories; some tidying & textual fixes
|
| Fri, 03 Dec 2010 13:36:53 +0000 |
Chris Cannam |
* Start using trivial new easyhg extension (requires PyQt)
|
| Fri, 03 Dec 2010 12:32:59 +0000 |
Chris Cannam |
* That string scraping was much too fiddly -- best keep it simpler for now
|
| Fri, 03 Dec 2010 12:29:57 +0000 |
Chris Cannam |
* Add InConflict state (not yet used)
|
| Fri, 03 Dec 2010 12:29:24 +0000 |
Chris Cannam |
* Some work on portable password prompting
|
| Thu, 02 Dec 2010 21:52:24 +0000 |
Chris Cannam |
* Default merge comments
|
| Thu, 02 Dec 2010 21:32:04 +0000 |
Chris Cannam |
* Another simplification to refresh logic, and some textual fixes
|
| Thu, 02 Dec 2010 21:13:53 +0000 |
Chris Cannam |
* Add translation support -- useful for proper plural handling even in English
|
| Thu, 02 Dec 2010 18:04:21 +0000 |
Chris Cannam |
* Try to reduce unnecessary history updates; add --new-branch option on push
|
| Thu, 02 Dec 2010 17:55:21 +0000 |
Chris Cannam |
* Show both parents of uncommitted merge; fixes to right-button menus
|
| Thu, 02 Dec 2010 11:51:15 +0000 |
Chris Cannam |
* Set parents (setCurrent) on history widget when we know the new parents, not at each enable-disable actions call
|
| Thu, 02 Dec 2010 11:33:09 +0000 |
Chris Cannam |
* Fix incremental log again (prune option requires number or hash, not compound id)
|
| Thu, 02 Dec 2010 11:31:42 +0000 |
Chris Cannam |
* Attempt to make the sequence of hg commands after a change more rational; avoid incremental log if heads unchanged
|
