| 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
|
| Mon, 30 Nov 2015 10:26:37 -0800 |
Siddharth Agarwal |
debugmergestate: print out null nodes as 'null'
|
changeset |
files
|
| Tue, 24 Nov 2015 15:03:00 -0800 |
Siddharth Agarwal |
test-merge-force.t: check .orig files separately
|
changeset |
files
|
| Tue, 24 Nov 2015 15:26:51 -0800 |
Siddharth Agarwal |
merge.recordupdates: mark 'a' files as added unconditionally
|
changeset |
files
|
| Mon, 30 Nov 2015 10:19:39 -0800 |
Siddharth Agarwal |
merge: add a new action type representing files to add/mark as modified
|
changeset |
files
|
| Mon, 30 Nov 2015 10:03:21 -0800 |
Siddharth Agarwal |
mergestate: add a cached property accessor for the local context
|
changeset |
files
|
| Mon, 30 Nov 2015 10:05:09 -0800 |
Siddharth Agarwal |
mergestate: raise exception if otherctx is accessed but _other isn't set
|
changeset |
files
|
| Mon, 30 Nov 2015 18:47:33 +0000 |
timeless |
pager: improve help for --pager=
|
changeset |
files
|
| Tue, 24 Nov 2015 21:17:26 -0800 |
Gregory Szorc |
setup: remove unused py_modules argument to setup()
|
changeset |
files
|
| Mon, 23 Nov 2015 13:45:56 -0800 |
Siddharth Agarwal |
test-merge-changedelete.t: add resolve --list output
|
changeset |
files
|
| Mon, 23 Nov 2015 13:43:14 -0800 |
Siddharth Agarwal |
test-merge-changedelete.t: add a file with regular merge conflicts
|
changeset |
files
|
| Tue, 24 Nov 2015 10:58:35 -0800 |
Siddharth Agarwal |
filemerge: in ':prompt', use ':fail' tool rather than returning directly
|
changeset |
files
|
| Tue, 24 Nov 2015 10:57:01 -0800 |
Siddharth Agarwal |
filemerge: in ':fail' tool, write out other side if local side is deleted
|
changeset |
files
|
| Mon, 23 Nov 2015 18:03:25 -0800 |
Siddharth Agarwal |
mergestate: explicitly forget 'dc' conflicts where the deleted side is picked
|
changeset |
files
|
| Mon, 23 Nov 2015 19:06:15 -0800 |
Siddharth Agarwal |
merge.applyupdates: add all actions returned from merge state
|
changeset |
files
|
| Fri, 27 Nov 2015 20:23:23 +0100 |
Mathias De Maré |
identify: refer to log to be able to view full hashes
|
changeset |
files
|
| Fri, 27 Nov 2015 20:23:02 +0100 |
Mathias De Maré |
log: add 'hg log' example for full hashes
|
changeset |
files
|
| Fri, 02 Oct 2015 07:48:23 +0200 |
Mathias De Maré |
backout: add examples to clarify basic usage
|
changeset |
files
|
| Wed, 25 Nov 2015 06:10:54 +0000 |
timeless |
gpg: rename sigcheck function
|
changeset |
files
|
| Tue, 24 Nov 2015 18:40:16 -0500 |
Augie Fackler |
extensions: properly mark progress as part of core
|
changeset |
files
|
| Fri, 27 Nov 2015 23:10:48 +0900 |
Yuya Nishihara |
test-help: don't use progress extension for the test of argument parsing
|
changeset |
files
|
| Tue, 24 Nov 2015 22:31:56 +0000 |
timeless |
hghave.py: fix matchoutput documentation
|
changeset |
files
|
| Tue, 24 Nov 2015 14:23:46 -0800 |
Gregory Szorc |
dispatch: use versiontuple()
|
changeset |
files
|
| Tue, 24 Nov 2015 14:23:51 -0800 |
Gregory Szorc |
util: add versiontuple() for returning parsed version information
|
changeset |
files
|
| Tue, 24 Nov 2015 16:38:54 -0800 |
Bryan O'Sullivan |
extensions: rename _ignore to _builtin, add descriptive comment
|
changeset |
files
|
| Sun, 22 Nov 2015 14:44:55 -0800 |
Gregory Szorc |
ui: avoid needless casting to a str
|
changeset |
files
|
| Tue, 24 Nov 2015 11:23:10 -0800 |
Gregory Szorc |
ui: remove labeled argument from popbuffer
|
changeset |
files
|
| Sun, 22 Nov 2015 14:18:42 -0800 |
Gregory Szorc |
color: evaluate labels at write time
|
changeset |
files
|
| Sun, 22 Nov 2015 14:13:25 -0800 |
Gregory Szorc |
cmdutil: pass labeled=True to pushbuffer()
|
changeset |
files
|
| Sun, 22 Nov 2015 14:10:48 -0800 |
Gregory Szorc |
ui: track label expansion when creating buffers
|
changeset |
files
|
| Tue, 01 Dec 2015 20:18:28 -0600 |
Matt Mackall |
Added signature for changeset 2d437a0f3355
stable
|
changeset |
files
|
| Tue, 01 Dec 2015 20:18:27 -0600 |
Matt Mackall |
Added tag 3.6.2 for changeset 2d437a0f3355
stable
|
changeset |
files
|
| Tue, 24 Nov 2015 18:13:25 -0800 |
Pierre-Yves David |
docker: match more version of 'hg docker version' (issue4967)
stable 3.6.2
|
changeset |
files
|
| Mon, 30 Nov 2015 16:31:28 -0800 |
Siddharth Agarwal |
localrepo.commit: check all files for resolve state (issue4972)
stable
|
changeset |
files
|
| Tue, 24 Nov 2015 21:41:12 +0000 |
timeless |
test-contrib-perf: add smoke tests for perf.py
|
changeset |
files
|
| Tue, 24 Nov 2015 21:36:20 +0000 |
timeless |
contrib/perf: perfparents handle filtered repos
|
changeset |
files
|
| Tue, 24 Nov 2015 20:54:14 +0000 |
timeless |
contrib/perf: perfparents handle tiny repos
|
changeset |
files
|
| Tue, 24 Nov 2015 21:44:16 +0000 |
timeless |
contrib/perf: fix perfmergecalculate
|
changeset |
files
|
| Tue, 24 Nov 2015 22:01:11 +0000 |
timeless |
contrib/perf: fix perffncachewrite
|
changeset |
files
|
| Tue, 24 Nov 2015 20:05:15 +0000 |
timeless |
contrib/perf: omit duplicated function
|
changeset |
files
|
| Tue, 24 Nov 2015 20:08:21 +0000 |
timeless |
contrib/perf: name functions to match decorators
|
changeset |
files
|
| Tue, 24 Nov 2015 22:26:43 +0000 |
timeless |
hghave.py: remove execute bit
|
changeset |
files
|
| Mon, 02 Nov 2015 17:33:18 +0000 |
Pierre-Yves David |
format: create new repository as 'generaldelta' by default
|
changeset |
files
|
| Sun, 22 Nov 2015 21:40:23 -0800 |
Siddharth Agarwal |
shelve: use colon instead of quotes in 'changes to' description
|
changeset |
files
|
| Sun, 22 Nov 2015 21:58:28 -0800 |
Siddharth Agarwal |
merge.applyupdates: create absentfilectxes for change/delete conflicts
|
changeset |
files
|
| Sun, 22 Nov 2015 21:59:52 -0800 |
Siddharth Agarwal |
mergestate: add methods to queue files to remove, add or get
|
changeset |
files
|
| Sun, 15 Nov 2015 21:27:22 -0800 |
Siddharth Agarwal |
resolve: record dirstate actions after performing resolutions
|
changeset |
files
|
| Fri, 20 Nov 2015 16:55:01 -0800 |
Siddharth Agarwal |
mergestate: add a way to record pending dirstate actions
|
changeset |
files
|
| Sun, 15 Nov 2015 21:55:46 -0800 |
Siddharth Agarwal |
merge.recordupdates: don't require action keys to be present in dict
|
changeset |
files
|
| Mon, 23 Nov 2015 10:13:05 -0500 |
Augie Fackler |
histedit: constant-ify the constraints list
|
changeset |
files
|
| Tue, 17 Nov 2015 15:04:31 -0800 |
Mateusz Kwapich |
histedit: add an experimental base action
|
changeset |
files
|
| Tue, 17 Nov 2015 17:53:52 -0800 |
Mateusz Kwapich |
histedit: add abortdirty function
|
changeset |
files
|
| Thu, 12 Nov 2015 16:40:33 -0800 |
Mateusz Kwapich |
histedit: add forceother constraint
|
changeset |
files
|
| Tue, 17 Nov 2015 16:37:26 -0800 |
Mateusz Kwapich |
histedit: make verification configurable
|
changeset |
files
|
| Fri, 13 Nov 2015 18:31:58 +0800 |
Anton Shestakov |
paper: show current revision on file log page
|
changeset |
files
|
| Fri, 20 Nov 2015 11:26:31 -0800 |
Siddharth Agarwal |
merge.applyupdates: extend action queues with ones returned from mergestate
|
changeset |
files
|
| Fri, 20 Nov 2015 16:43:25 -0800 |
Siddharth Agarwal |
mergestate: add a method to compute actions to perform on dirstate
|
changeset |
files
|
| Fri, 20 Nov 2015 16:37:39 -0800 |
Siddharth Agarwal |
merge.applyupdates: use counters from mergestate
|
changeset |
files
|