| Tue, 01 Dec 2015 09:48:38 -0800 |
Siddharth Agarwal |
filemerge: default regular prompts to 'leave unresolved' (BC)
|
changeset |
files
|
| Mon, 30 Nov 2015 13:43:55 -0800 |
Siddharth Agarwal |
filemerge: add a 'leave unresolved' option to change/delete prompts
|
changeset |
files
|
| Mon, 30 Nov 2015 11:17:18 -0800 |
Siddharth Agarwal |
filemerge: add a 'leave unresolved' option to regular prompts
|
changeset |
files
|
| Wed, 25 Nov 2015 14:25:26 -0800 |
Siddharth Agarwal |
filemerge: add debug output for whether this is a change/delete conflict
|
changeset |
files
|
| Sat, 28 Nov 2015 17:06:29 +0800 |
Anton Shestakov |
webcommands: test that fctx is not None in filediff()
|
changeset |
files
|
| Sat, 28 Nov 2015 16:46:31 +0800 |
Anton Shestakov |
webcommands: stop using ersatz if-else ternary operator for rename variable
|
changeset |
files
|
| Sat, 28 Nov 2015 16:02:22 +0800 |
Anton Shestakov |
webcommands: get correct parents when comparing a removed file (issue4962)
|
changeset |
files
|
| Mon, 30 Nov 2015 16:38:29 -0800 |
Laurent Charignon |
repair: use bookmarks.recordchange instead of bookmarks.write
|
changeset |
files
|
| Mon, 30 Nov 2015 16:37:42 -0800 |
Laurent Charignon |
commit: add amend mode for commit -i
|
changeset |
files
|
| Mon, 30 Nov 2015 16:35:21 -0800 |
Laurent Charignon |
commit: add a way to return more information from the chunkselector
|
changeset |
files
|
| Sat, 21 Nov 2015 17:40:26 +0200 |
Mykola Nikishov |
histedit: edit with custom filename
|
changeset |
files
|
| Sat, 21 Nov 2015 22:04:09 +0200 |
Mykola Nikishov |
ui: allow open editor with custom filename
|
changeset |
files
|
| Mon, 30 Nov 2015 20:45:07 +0000 |
timeless |
help: make help deprecated mention the extension
|
changeset |
files
|
| Mon, 30 Nov 2015 20:44:22 +0000 |
timeless |
help: make listexts less confusing for deprecated exts
|
changeset |
files
|
| Sun, 29 Nov 2015 06:51:23 +0000 |
timeless |
patchbomb: rename email function
|
changeset |
files
|
| Sun, 29 Nov 2015 06:51:23 +0000 |
timeless |
graphlog: rename glog function
|
changeset |
files
|
| Sat, 28 Nov 2015 04:11:57 -0500 |
Mike Edgar |
commit: preserve extra when amending with commit --amend
|
changeset |
files
|
| Sat, 28 Nov 2015 04:11:38 -0500 |
Mike Edgar |
graft: copy extra (except branch) when copying changesets
|
changeset |
files
|
| Sat, 28 Nov 2015 04:11:14 -0500 |
Mike Edgar |
rebase: propagate extra dict from rebase source changeset
|
changeset |
files
|
| Wed, 25 Nov 2015 18:26:48 +0100 |
Mathias De Maré |
histedit: add examples
|
changeset |
files
|
| Wed, 25 Nov 2015 18:10:59 +0100 |
Mathias De Maré |
commands: add examples for 'addremove'
|
changeset |
files
|
| Wed, 25 Nov 2015 18:10:31 +0100 |
Mathias De Maré |
commands: add example for 'hg add'
|
changeset |
files
|
| Tue, 24 Nov 2015 15:16:25 -0800 |
Gregory Szorc |
extensions: refuse to load extensions if minimum hg version not met
|
changeset |
files
|
| Wed, 25 Nov 2015 00:39:05 +0000 |
timeless |
run-tests: add --slowtimeout and use it for slow tests
|
changeset |
files
|
| Sat, 31 Oct 2015 22:17:05 +0900 |
Yuya Nishihara |
serve: unify cmdutil.service() calls of commandserver and hgweb
|
changeset |
files
|
| Sat, 31 Oct 2015 22:15:16 +0900 |
Yuya Nishihara |
hgweb: extract factory function of httpservice object
|
changeset |
files
|
| Sat, 31 Oct 2015 21:57:45 +0900 |
Yuya Nishihara |
hgweb: move httpservice object from commands module
|
changeset |
files
|
| Wed, 25 Nov 2015 14:25:33 -0800 |
Siddharth Agarwal |
merge: move almost all change/delete conflicts to resolve phase (BC) (API)
|
changeset |
files
|
| Wed, 25 Nov 2015 14:26:46 -0800 |
Siddharth Agarwal |
test-merge-changedelete.t: print out debugmergestate
|
changeset |
files
|
| Tue, 24 Nov 2015 18:26:21 -0800 |
Siddharth Agarwal |
debugmergestate: also recognize change/delete conflicts in the merge state
|
changeset |
files
|