hg-stable: revision graph

graph

less more | rev 27176: (0) -10000 -3000 -1000 -240 +240 +1000 +3000 +10000 tip

dirstate: change debugrebuilddirstate --minimal to use dirstate.rebuild
Mon, 30 Nov 2015 11:23:15 -0800, by Christian Delahousse
debugrebuilddirstate: added tests for --minimal flag
Tue, 01 Dec 2015 10:52:36 -0800, by Christian Delahousse
debugdirstate: add command to rebuildstate test to modify dirstate
Tue, 01 Dec 2015 11:17:14 -0800, by Christian Delahousse
graft: improve --continue abort message
Wed, 02 Dec 2015 06:33:52 +0000, by timeless
summary: mention graft
Wed, 02 Dec 2015 06:31:12 +0000, by timeless
histedit: mention histedit-last-edit.txt on abort
Wed, 02 Dec 2015 08:07:36 +0000, by timeless
histedit: add missing raise keyword to statement
Wed, 02 Dec 2015 07:40:42 +0000, by timeless
histedit: improve grammar for _histedit comment
Wed, 02 Dec 2015 07:39:49 +0000, by timeless
test-fncache: ensure lock doesn't look held to __del__
Tue, 01 Dec 2015 14:44:08 -0500, by Augie Fackler
commands: inline definition of localrepo.parents() and drop the method (API)
Wed, 11 Nov 2015 20:07:15 -0500, by Augie Fackler
localrepo: document nodebookmarks
Wed, 11 Nov 2015 20:02:05 -0500, by Augie Fackler
localrepo: remove clone method by hoisting into hg.py
Wed, 11 Nov 2015 19:47:49 -0500, by Augie Fackler
filemerge: default regular prompts to 'leave unresolved' (BC)
Tue, 01 Dec 2015 09:48:38 -0800, by Siddharth Agarwal
filemerge: add a 'leave unresolved' option to change/delete prompts
Mon, 30 Nov 2015 13:43:55 -0800, by Siddharth Agarwal
filemerge: add a 'leave unresolved' option to regular prompts
Mon, 30 Nov 2015 11:17:18 -0800, by Siddharth Agarwal
filemerge: add debug output for whether this is a change/delete conflict
Wed, 25 Nov 2015 14:25:26 -0800, by Siddharth Agarwal
webcommands: test that fctx is not None in filediff()
Sat, 28 Nov 2015 17:06:29 +0800, by Anton Shestakov
webcommands: stop using ersatz if-else ternary operator for rename variable
Sat, 28 Nov 2015 16:46:31 +0800, by Anton Shestakov
webcommands: get correct parents when comparing a removed file (issue4962)
Sat, 28 Nov 2015 16:02:22 +0800, by Anton Shestakov
repair: use bookmarks.recordchange instead of bookmarks.write
Mon, 30 Nov 2015 16:38:29 -0800, by Laurent Charignon
commit: add amend mode for commit -i
Mon, 30 Nov 2015 16:37:42 -0800, by Laurent Charignon
commit: add a way to return more information from the chunkselector
Mon, 30 Nov 2015 16:35:21 -0800, by Laurent Charignon
histedit: edit with custom filename
Sat, 21 Nov 2015 17:40:26 +0200, by Mykola Nikishov
ui: allow open editor with custom filename
Sat, 21 Nov 2015 22:04:09 +0200, by Mykola Nikishov
help: make help deprecated mention the extension
Mon, 30 Nov 2015 20:45:07 +0000, by timeless
help: make listexts less confusing for deprecated exts
Mon, 30 Nov 2015 20:44:22 +0000, by timeless
patchbomb: rename email function
Sun, 29 Nov 2015 06:51:23 +0000, by timeless
graphlog: rename glog function
Sun, 29 Nov 2015 06:51:23 +0000, by timeless
commit: preserve extra when amending with commit --amend
Sat, 28 Nov 2015 04:11:57 -0500, by Mike Edgar
graft: copy extra (except branch) when copying changesets
Sat, 28 Nov 2015 04:11:38 -0500, by Mike Edgar
rebase: propagate extra dict from rebase source changeset
Sat, 28 Nov 2015 04:11:14 -0500, by Mike Edgar
histedit: add examples
Wed, 25 Nov 2015 18:26:48 +0100, by Mathias De Maré
commands: add examples for 'addremove'
Wed, 25 Nov 2015 18:10:59 +0100, by Mathias De Maré
commands: add example for 'hg add'
Wed, 25 Nov 2015 18:10:31 +0100, by Mathias De Maré
extensions: refuse to load extensions if minimum hg version not met
Tue, 24 Nov 2015 15:16:25 -0800, by Gregory Szorc
run-tests: add --slowtimeout and use it for slow tests
Wed, 25 Nov 2015 00:39:05 +0000, by timeless
serve: unify cmdutil.service() calls of commandserver and hgweb
Sat, 31 Oct 2015 22:17:05 +0900, by Yuya Nishihara
hgweb: extract factory function of httpservice object
Sat, 31 Oct 2015 22:15:16 +0900, by Yuya Nishihara
hgweb: move httpservice object from commands module
Sat, 31 Oct 2015 21:57:45 +0900, by Yuya Nishihara
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
revsetbenchmarks: support benchmarking changectx loading
Sat, 21 Nov 2015 15:43:04 -0800, by Gregory Szorc
perf: support obtaining contexts from perfrevset
Sat, 21 Nov 2015 15:39:18 -0800, by Gregory Szorc
localrepo: improve docstring for revset methods
Sat, 21 Nov 2015 11:07:30 -0800, by Gregory Szorc
revlog: improve documentation
Sun, 22 Nov 2015 16:23:20 -0800, by Gregory Szorc
demandimport: don't enable when running under PyPy
Sat, 21 Nov 2015 22:28:01 -0800, by Gregory Szorc
ui.write: don't clear progress bar when writing to a buffer
Sat, 14 Nov 2015 17:14:14 -0800, by Gregory Szorc
test-resolve: fix '--tool f' invocation for Windows
Sun, 22 Nov 2015 21:20:08 -0500, by Matt Harbison
util.datestr: use divmod()
Sat, 14 Nov 2015 17:30:10 -0800, by Gregory Szorc
cmdutil.changeset_printer: pass context into showpatch()
Sat, 14 Nov 2015 17:44:01 -0800, by Gregory Szorc
context: avoid extra parents lookups
Sat, 21 Nov 2015 19:21:01 -0800, by Gregory Szorc
context: optimize _parents()
Sat, 21 Nov 2015 19:04:12 -0800, by Gregory Szorc
test-histedit: $TESTTMP quoting fixes for Windows
Sun, 22 Nov 2015 13:05:21 -0500, by Matt Harbison
lsprof: support PyPy (issue4573)
Sat, 21 Nov 2015 23:26:22 -0800, by Gregory Szorc
base85: clean up function definition style
Wed, 11 Nov 2015 19:10:45 -0500, by Augie Fackler
rebase: use bookmarks.recordchange instead of bookmarks.write
Fri, 20 Nov 2015 14:06:31 -0800, by Laurent Charignon
rebase: indentation change to make the next patch more legible
Fri, 20 Nov 2015 11:36:05 -0800, by Laurent Charignon
test-run-tests: conditionalize the $TESTDIR check for Windows separator
Mon, 16 Nov 2015 16:56:00 -0500, by Matt Harbison
test-context: conditionalize the workingfilectx date printing for Windows
Mon, 09 Nov 2015 17:15:36 -0500, by Matt Harbison
test-mq-qrefresh: drop single quoting of HGEDITOR value for Windows
Mon, 16 Nov 2015 14:37:03 -0500, by Matt Harbison
test-import: don't use printf to append an extension to $HGRCPATH
Mon, 16 Nov 2015 14:12:27 -0500, by Matt Harbison
test-ssh: stop quoting dummyssh invocation for Windows
Mon, 16 Nov 2015 13:44:27 -0500, by Matt Harbison
strip: use repo._bookmarks.recordchange instead of repo._bookmarks.write
Fri, 20 Nov 2015 13:46:36 -0800, by Laurent Charignon
histedit: make use of bookmarks.recordchange instead of bookmarks.write
Fri, 20 Nov 2015 13:23:47 -0800, by Laurent Charignon
largefiles: fall back to the original for change/delete conflicts
Wed, 18 Nov 2015 17:40:13 -0800, by Siddharth Agarwal
mergestate.add: store absentfilectxes as nullhex
Sat, 14 Nov 2015 00:07:11 -0800, by Siddharth Agarwal
mergestate._resolve: handle change/delete conflicts
Fri, 20 Nov 2015 01:14:15 -0800, by Siddharth Agarwal
filemerge: don't try to copy files known to be absent
Sat, 14 Nov 2015 00:00:46 -0800, by Siddharth Agarwal
hgweb: use absolute_import
Sat, 31 Oct 2015 22:07:40 +0900, by Yuya Nishihara
hgweb: import wsgicgi at top level
Sun, 01 Nov 2015 15:09:35 +0900, by Yuya Nishihara
hgweb: import BaseHTTPServer as module at top level
Sun, 01 Nov 2015 15:07:08 +0900, by Yuya Nishihara
hgweb: do not import hgweb_mod.hgweb and .makebreadcrumb as symbol
Sun, 01 Nov 2015 14:23:23 +0900, by Yuya Nishihara
filemerge: don't try using external tools on change/delete conflicts
Fri, 13 Nov 2015 23:57:43 -0800, by Siddharth Agarwal
filemerge: don't attempt to premerge change/delete conflicts
Fri, 13 Nov 2015 23:56:00 -0800, by Siddharth Agarwal
filemerge._mergecheck: add check for change/delete conflicts
Fri, 13 Nov 2015 23:58:05 -0800, by Siddharth Agarwal
filemerge._picktool: only pick from nomerge tools for change/delete conflicts
Sun, 15 Nov 2015 21:40:15 -0800, by Siddharth Agarwal
filemerge: add support for change/delete conflicts to the ':prompt' tool
Fri, 13 Nov 2015 23:52:26 -0800, by Siddharth Agarwal
filemerge: add support for change/delete conflicts to the ':other' merge tool
Wed, 18 Nov 2015 15:41:50 -0800, by Siddharth Agarwal
filemerge: add support for change/delete conflicts to the ':local' merge tool
Wed, 18 Nov 2015 15:40:28 -0800, by Siddharth Agarwal
merge.mergestate: compute dirstate action
Thu, 19 Nov 2015 10:50:02 -0800, by Siddharth Agarwal
filemerge: return whether the file was deleted
Wed, 18 Nov 2015 14:22:52 -0800, by Siddharth Agarwal
filemerge: return whether the file is deleted from all other merge tools
Wed, 18 Nov 2015 13:55:31 -0800, by Siddharth Agarwal
filemerge: return whether the file is deleted for nomerge internal tools
Wed, 18 Nov 2015 13:52:28 -0800, by Siddharth Agarwal
mergestate: allow storing and retrieving change/delete conflicts
Wed, 18 Nov 2015 15:46:45 -0800, by Siddharth Agarwal
strip: changing bookmark argument to be a list
Thu, 19 Nov 2015 12:50:10 +0530, by Shubhanshu Agrawal
strip: strip a list of bookmarks
Sun, 15 Nov 2015 21:03:44 +0530, by Shubhanshu Agrawal
revset: speed up '_matchfiles'
Wed, 18 Nov 2015 23:23:03 -0800, by Pierre-Yves David
mergestate: handle additional record types specially
Wed, 18 Nov 2015 15:46:45 -0800, by Siddharth Agarwal
test-resolve.t: remove completely unnecessary line
Wed, 18 Nov 2015 23:42:32 -0800, by Siddharth Agarwal
resolve: fix incorrect merge
Wed, 18 Nov 2015 23:43:18 -0800, by Siddharth Agarwal
fileset: add missing() predicate (issue4925)
Wed, 18 Nov 2015 20:55:32 +0100, by liscju
webutil: make _siblings into an object with __iter__ and __len__
Tue, 10 Nov 2015 17:22:40 +0800, by Anton Shestakov
mergestate: move binary format documentation into _readrecordsv2
Wed, 18 Nov 2015 16:39:30 -0800, by Siddharth Agarwal
unshelve: add support for custom merge tools
Wed, 18 Nov 2015 15:11:23 -0800, by Siddharth Agarwal
unshelve: shed spurious space
Wed, 18 Nov 2015 15:18:16 -0800, by Siddharth Agarwal
unshelve: add -k as short form of --keep
Wed, 18 Nov 2015 15:04:03 -0800, by Siddharth Agarwal
import-checker: allow symbol imports from hgweb.common and .request
Sun, 01 Nov 2015 13:55:21 +0900, by Yuya Nishihara
perf: un-bitrot perfstatus
Thu, 19 Nov 2015 15:02:27 -0600, by Matt Mackall
util: drop statmtimesec
Thu, 19 Nov 2015 13:15:17 -0600, by Matt Mackall
util: disable floating point stat times (issue4836)
Thu, 19 Nov 2015 13:21:24 -0600, by Matt Mackall
rebase: refactoring to avoid repetition of expression
Wed, 18 Nov 2015 15:58:06 -0800, by Laurent Charignon
rebase: remove an unused todo
Wed, 18 Nov 2015 16:06:00 -0800, by Laurent Charignon
rebase: don't rebase obsolete commits with no successor
Wed, 18 Nov 2015 13:44:29 -0800, by Laurent Charignon
rebase: fix a typo in test-rebase-obsolete
Wed, 18 Nov 2015 13:46:42 -0800, by Laurent Charignon
merge with stable
Wed, 18 Nov 2015 20:59:17 -0600, by Matt Mackall
hgweb: unify import style of error classes
Sun, 01 Nov 2015 14:43:25 +0900, by Yuya Nishihara
hgweb: do not import templatefilters.revescape and websub as symbol
Sun, 01 Nov 2015 14:00:14 +0900, by Yuya Nishihara
hgweb: alias ui module as uimod
Sun, 01 Nov 2015 13:58:32 +0900, by Yuya Nishihara
mergestate.commit: factor out making the list of records
Tue, 17 Nov 2015 14:23:26 -0800, by Siddharth Agarwal
mergestate: move _read() call to read constructor
Tue, 17 Nov 2015 14:04:56 -0800, by Siddharth Agarwal
debugmergestate: explain why we create mergestate objects directly
Tue, 17 Nov 2015 14:22:30 -0800, by Siddharth Agarwal
debugdirstate: convert keyword parameters to **opts
Wed, 11 Nov 2015 13:28:00 -0800, by Christian Delahousse
convert: changed test's progress output format to ignore estimate
Tue, 17 Nov 2015 18:01:21 -0800, by Christian Delahousse
mq: use repo._bookmarks.recordchange instead of repo._bookmarks.write
Tue, 17 Nov 2015 13:12:33 -0800, by Laurent Charignon
mq: indentation change to make the next patch more legible
Tue, 17 Nov 2015 13:12:46 -0800, by Laurent Charignon
bookmarks: use repo._bookmarks.recordchange instead of repo._bookmarks.write
Tue, 17 Nov 2015 12:49:57 -0800, by Laurent Charignon
localrepo: put bookmark move following commit in one transaction
Wed, 18 Nov 2015 01:36:58 -0800, by Laurent Charignon
test-resolve.t: switch to mergestate.read()
Tue, 17 Nov 2015 15:43:21 -0800, by Siddharth Agarwal
localrepo.commit: switch to mergestate.read()
Tue, 17 Nov 2015 13:58:50 -0800, by Siddharth Agarwal
fileset: switch to mergestate.read()
Tue, 17 Nov 2015 13:57:38 -0800, by Siddharth Agarwal
commands.summary: switch to mergestate.read()
Tue, 17 Nov 2015 14:20:55 -0800, by Siddharth Agarwal
commands.resolve: switch to mergestate.read()
Tue, 17 Nov 2015 13:56:46 -0800, by Siddharth Agarwal
shelve: switch to mergestate.read()
Tue, 17 Nov 2015 13:56:10 -0800, by Siddharth Agarwal
mergestate: add a constructor that reads state from disk
Tue, 17 Nov 2015 13:55:30 -0800, by Siddharth Agarwal
merge.applyupdates: switch to mergestate.clean()
Tue, 17 Nov 2015 17:04:53 -0800, by Siddharth Agarwal
localrepo: switch to mergestate.clean()
Tue, 17 Nov 2015 17:04:32 -0800, by Siddharth Agarwal
strip: switch to mergestate.clean()
Tue, 17 Nov 2015 17:02:35 -0800, by Siddharth Agarwal
mergestate: add a constructor that sets up a clean merge state
Tue, 17 Nov 2015 17:00:54 -0800, by Siddharth Agarwal
mergestate: raise structured exception for unsupported merge records
Tue, 17 Nov 2015 14:11:52 -0800, by Siddharth Agarwal
error: add a structured exception for unsupported merge records
Tue, 17 Nov 2015 14:10:12 -0800, by Siddharth Agarwal
dirstate: back out 502b56a9e897
Tue, 17 Nov 2015 13:47:16 -0800, by Bryan O'Sullivan
osutil: make statfiles check for interrupts periodically
Tue, 17 Nov 2015 13:47:14 -0800, by Bryan O'Sullivan
osutil: don't leak on statfiles error
Tue, 17 Nov 2015 13:43:09 -0800, by Bryan O'Sullivan
histedit: extracts _isdirtywc function
Thu, 12 Nov 2015 12:44:15 +0100, by liscju
node: add 'nullhex', hex-encoded nullid
Mon, 16 Nov 2015 11:23:32 -0800, by Siddharth Agarwal
filemerge: introduce class whose objects represent files not in a context
Mon, 16 Nov 2015 11:45:35 -0800, by Siddharth Agarwal
filectx: add isabsent method
Mon, 16 Nov 2015 11:27:27 -0800, by Siddharth Agarwal
filectx: allow custom comparators
Fri, 13 Nov 2015 22:37:51 -0800, by Siddharth Agarwal
debugmergestate: print out record type for files
Fri, 13 Nov 2015 23:01:36 -0800, by Siddharth Agarwal
merge.applyupdates: don't return early if merge driver's conclude failed
Sun, 15 Nov 2015 22:45:20 -0800, by Siddharth Agarwal
convert: use repo._bookmarks.recordchange instead of repo._bookmarks.write
Mon, 16 Nov 2015 17:15:36 -0800, by Laurent Charignon
convert: indentation change to make the next patch more legible
Mon, 16 Nov 2015 17:14:15 -0800, by Laurent Charignon
strip: renaming local variables
Sun, 15 Nov 2015 20:27:27 +0530, by Shubhanshu Agrawal
test-rename-merge2: make selected output less arbitrary
Wed, 11 Feb 2015 22:22:29 -0800, by Martin von Zweigbergk
test-convert-git: drop a git warning that doesn't occur on Windows
Sun, 15 Nov 2015 22:11:23 -0500, by Matt Harbison
tests: fix globs for Windows
Sun, 15 Nov 2015 21:12:13 -0500, by Matt Harbison
pull: return 255 value on update failure (issue4948) (BC)
Sun, 15 Nov 2015 22:58:28 +0100, by liscju
filemerge: remove leading space from " no tool found..."
Wed, 11 Nov 2015 10:19:11 -0800, by Martin von Zweigbergk
test-encoding: enable fuzz testing of utf8b roundtrip
Mon, 09 Nov 2015 22:31:01 +0900, by Yuya Nishihara
import-checker: reset context to verify convention in function scope
Sun, 01 Nov 2015 17:42:03 +0900, by Yuya Nishihara
import-checker: allow import of child modules from package root
Sun, 01 Nov 2015 00:37:22 +0900, by Yuya Nishihara
encoding: extend test cases for utf8b
Mon, 02 Nov 2015 17:17:33 -0600, by Matt Mackall
merge: make 'cd' and 'dc' actions store the same arguments as 'm'
Fri, 13 Nov 2015 22:43:09 -0800, by Siddharth Agarwal
merge: stop emptying out 'cd' and 'dc' actions
Fri, 13 Nov 2015 14:24:22 -0800, by Siddharth Agarwal
rebase: add returning value from pullrebase function stable
Sun, 15 Nov 2015 22:18:48 +0100, by liscju
resolve: restore .orig only after merge is fully complete (issue4952) stable
Fri, 13 Nov 2015 15:56:02 -0800, by Siddharth Agarwal
monoblue: add a space to separate navigation links in file log footer
Fri, 06 Nov 2015 22:32:00 +0800, by Anton Shestakov
merge: move messages about possible conflicts a litte earlier
Thu, 12 Nov 2015 13:14:03 -0800, by Martin von Zweigbergk
import-checker: include lineno in warning message
Sun, 01 Nov 2015 15:46:06 +0900, by Yuya Nishihara
import-checker: extract function to generate a formatted warning
Sun, 01 Nov 2015 15:39:25 +0900, by Yuya Nishihara
import-checker: make it executable for convenience
Sun, 01 Nov 2015 13:53:05 +0900, by Yuya Nishihara
test-fileset: glob the updated file count for Windows stability
Mon, 09 Nov 2015 17:20:50 -0500, by Matt Harbison
tests: tolerate differences between Linux and Windows error strings
Mon, 09 Nov 2015 13:12:35 -0500, by Matt Harbison
test-largefiles-cache: add glob for Windows
Mon, 09 Nov 2015 12:51:58 -0500, by Matt Harbison
tests: make 'f' tool open files in binary mode when hexdumping
Mon, 09 Nov 2015 12:49:31 -0500, by Matt Harbison
merge.applyupdates: only attempt to merge files in mergeactions
Thu, 12 Nov 2015 14:29:02 -0800, by Siddharth Agarwal
filemerge: rename _symlinkcheck to _mergecheck
Wed, 11 Nov 2015 17:34:28 -0800, by Siddharth Agarwal
test-merge-prompt.t: rename to test-merge-changedelete.t
Wed, 11 Nov 2015 17:32:41 -0800, by Siddharth Agarwal
merge with stable
Thu, 12 Nov 2015 20:48:41 -0600, by Matt Mackall
tags: create new sortdict for performance reasons stable
Thu, 12 Nov 2015 13:16:04 -0800, by Gregory Szorc
largefiles: specify where .orig files are kept
Tue, 10 Nov 2015 15:08:56 -0800, by Christian Delahousse
mq: let the user choose where .orig files are kept
Tue, 10 Nov 2015 14:52:54 -0800, by Christian Delahousse
shelve: choose where .orig file locations are kept
Tue, 10 Nov 2015 14:41:14 -0800, by Christian Delahousse
filemerge: choose where .orig files are kept
Tue, 10 Nov 2015 16:25:59 -0800, by Christian Delahousse
git-subrepos: revert respects specified location to save .orig files
Tue, 10 Nov 2015 14:29:13 -0800, by Christian Delahousse
resolve: choose where .orig file locations are kept
Tue, 10 Nov 2015 14:26:19 -0800, by Christian Delahousse
revert: allow configuring the .orig file location
Thu, 12 Nov 2015 17:00:08 -0600, by Christian Delahousse
cmdutil: add origbackuppath helper
Thu, 12 Nov 2015 16:56:06 -0600, by Christian Delahousse

less more | rev 27176: (0) -10000 -3000 -1000 -240 +240 +1000 +3000 +10000 tip

Mercurial > hg-stable

graph