Mercurial > hg

log

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | rev 34558: (0) -30000 -10000 -3000 -1000 -300 -100 -60 +60 +100 +300 +1000 +3000 +10000 tip
age author description
Mon, 02 Oct 2017 14:05:30 -0700 Mark Thomas tests: add test for path conflicts during merge
Mon, 02 Oct 2017 14:05:30 -0700 Mark Thomas tests: add test for path conflicts during update
Mon, 02 Oct 2017 14:05:30 -0700 Mark Thomas context: also consider path conflicts when clearing unknown files
Mon, 02 Oct 2017 14:05:30 -0700 Mark Thomas merge: check for path conflicts when merging (issue5628)
Mon, 02 Oct 2017 14:05:30 -0700 Mark Thomas util: add safename function for generating safe names to rename to
Mon, 02 Oct 2017 14:05:30 -0700 Mark Thomas merge: improve error messages for path conflicts during update
Mon, 02 Oct 2017 14:05:30 -0700 Mark Thomas merge: check for path conflicts when updating (issue5628)
Mon, 02 Oct 2017 14:05:30 -0700 Mark Thomas merge: rename conflicts to fileconflicts in _checkunknownfiles
Mon, 02 Oct 2017 14:05:30 -0700 Mark Thomas merge: add _checkunknowndirs function for detecting path conflicts
Mon, 02 Oct 2017 14:05:30 -0700 Mark Thomas merge: backup conflicting directories when getting files
Mon, 02 Oct 2017 14:05:30 -0700 Mark Thomas merge: add merge action 'pr' to rename files during update
Mon, 02 Oct 2017 14:05:30 -0700 Mark Thomas merge: add merge action 'p' to record path conflicts during update
Mon, 02 Oct 2017 14:05:30 -0700 Mark Thomas commands: update the resolve command to handle path conflicts
Mon, 02 Oct 2017 14:05:30 -0700 Mark Thomas merge: add pathconflict merge state
Mon, 02 Oct 2017 14:05:30 -0700 Mark Thomas tests: add a test demonstrating basic path conflict failures
Mon, 02 Oct 2017 14:05:30 -0700 Mark Thomas scmutil: handle conflicting files and dirs in origbackuppath
Sun, 01 Oct 2017 12:21:50 +0100 Yuya Nishihara extdata: show debug message if external command exits with non-zero status
Sat, 30 Sep 2017 08:57:50 +0100 Yuya Nishihara templatekw: allow accessing to nested namespace item by its template name
Sat, 30 Sep 2017 08:50:24 +0100 Yuya Nishihara templatekw: get rid of temporary dicts from shownamespaces()
Mon, 18 Sep 2017 23:53:05 +0900 Yuya Nishihara templatekw: rename peerpaths to peerurls per naming convention (BC)
Mon, 18 Sep 2017 23:31:01 +0900 Yuya Nishihara templatekw: make experimental {peerpaths} return a single-level dict (BC)
Mon, 18 Sep 2017 23:49:05 +0900 Yuya Nishihara templatekw: fix scope of peerpath url bound to generator
Mon, 18 Sep 2017 23:07:17 +0900 Yuya Nishihara templater: extend dot operator as a short for get(dict, key)
Sat, 09 Sep 2017 19:32:56 +0900 Yuya Nishihara templater: add dot operator to easily access a sub item
Sat, 09 Sep 2017 19:13:25 +0900 Yuya Nishihara templater: wrap get/min/max result so map operation can apply to element
Mon, 02 Oct 2017 07:18:24 +0100 Yuya Nishihara dispatch: move initialization of sys.std* files
Mon, 02 Oct 2017 06:52:10 +0100 Yuya Nishihara py3: work around the scope of exception variable in dispatch.run()
Sat, 07 Oct 2017 22:07:10 +0900 Yuya Nishihara chg: just forward --time to command server
Mon, 09 Oct 2017 02:30:23 -0700 Kostia Balytskyi windows: add an experimental option for long paths support
Sun, 08 Oct 2017 22:07:47 +0200 Boris Feld configitems: register the 'experimental.graphstyle.grandparent' config
Sun, 08 Oct 2017 22:07:21 +0200 Boris Feld configitems: register the 'experimental.graphstyle.missing' config
Sun, 08 Oct 2017 22:06:35 +0200 Boris Feld configitems: register the 'experimental.graphstyle.parent' config
Sun, 08 Oct 2017 21:41:37 +0200 Boris Feld configitems: register the 'devel.empty-changegroup' config
Sun, 08 Oct 2017 21:41:22 +0200 Boris Feld configitems: register the 'devel.cache-vfs' config
Sun, 08 Oct 2017 21:36:26 +0200 Boris Feld configitems: register the 'devel.warn-config-default' config
Sun, 08 Oct 2017 21:41:10 +0200 Boris Feld configitems: register the 'devel.warn-config' config
Sun, 08 Oct 2017 21:48:40 +0200 Boris Feld configitems: register 'merge.checkunknown' and 'merge.checkignored'
Sun, 08 Oct 2017 21:47:14 +0200 Boris Feld configitems: register the 'diff.*' config
Sun, 08 Oct 2017 20:43:46 +0200 Boris Feld configitems: register the 'experimental.mmapindexthreshold' config
Sun, 08 Oct 2017 20:42:19 +0200 Boris Feld configitems: register the 'experimental.maxdeltachainspan' config
Sun, 08 Oct 2017 20:16:09 +0200 Boris Feld configitems: register the 'commands.show.aliasprefix' config
Sun, 08 Oct 2017 20:11:34 +0200 Boris Feld configitems: register the 'blackbox.track' config
Sun, 08 Oct 2017 04:39:42 +0530 Pulkit Goyal copies: add docs for config `experimental.copytrace.sourcecommitlimit`
Thu, 05 Oct 2017 14:29:13 -0400 Augie Fackler hgweb: extract function for loading style from request context
Thu, 05 Oct 2017 14:27:21 -0400 Augie Fackler request: coerce content-type to native str
Thu, 05 Oct 2017 14:26:09 -0400 Augie Fackler request: use trivial iterator over dictionary keys
Thu, 05 Oct 2017 14:22:02 -0400 Augie Fackler hgweb: when constructing or adding to a wsgi environ dict, use native strs
Thu, 05 Oct 2017 14:17:50 -0400 Augie Fackler hgweb: produce native string for etag value
Thu, 05 Oct 2017 14:13:20 -0400 Augie Fackler hgweb: in protocol adapter, look for bytes instances, not str
Thu, 05 Oct 2017 14:12:51 -0400 Augie Fackler hgweb: in protocol adapter, avoid control reaching end of non-void function
Thu, 05 Oct 2017 14:18:55 -0700 Saurabh Singh test-check-code: fail new commits which use 'atexit' instead of 'ui.atexit'
Thu, 05 Oct 2017 20:46:49 +0000 Saurabh Singh test-push-race: use 'ui.atexit' instead of python's 'atexit'
Mon, 02 Oct 2017 04:48:06 +0530 Pulkit Goyal py3: use '%d' for integers instead of '%s'
Mon, 02 Oct 2017 04:46:17 +0530 Pulkit Goyal py3: fix keyword arguments handling in mq
Thu, 05 Oct 2017 20:41:50 -0700 Jun Wu test-rebase-base: clarify it is about the "--base" flag
Fri, 30 Jun 2017 03:36:10 +0200 Boris Feld configitems: register the 'convert.p4.encoding' config
Fri, 30 Jun 2017 03:42:34 +0200 Boris Feld configitems: register the 'gpg.key' config
Fri, 30 Jun 2017 03:42:33 +0200 Boris Feld configitems: register the 'gpg.cmd' config
Fri, 30 Jun 2017 03:42:50 +0200 Boris Feld configitems: register the 'keywordset.svn' config
Fri, 30 Jun 2017 03:42:35 +0200 Boris Feld configitems: register the 'hgk.path' config
less more | rev 34558: (0) -30000 -10000 -3000 -1000 -300 -100 -60 +60 +100 +300 +1000 +3000 +10000 tip