Mercurial: revision graph

graph

less more | rev 27137: (0) -10000 -3000 -1000 -300 -100 -64 +64 +100 +300 +1000 +3000 +10000 tip

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

less more | rev 27137: (0) -10000 -3000 -1000 -300 -100 -64 +64 +100 +300 +1000 +3000 +10000 tip

Mercurial > hg

graph