Mercurial > hg-stable

log

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | rev 27048: (0) -10000 -3000 -1000 -300 -100 -60 +60 +100 +300 +1000 +3000 +10000 tip
age author description
Fri, 20 Nov 2015 01:14:15 -0800 Siddharth Agarwal mergestate._resolve: handle change/delete conflicts
Sat, 14 Nov 2015 00:00:46 -0800 Siddharth Agarwal filemerge: don't try to copy files known to be absent
Sat, 31 Oct 2015 22:07:40 +0900 Yuya Nishihara hgweb: use absolute_import
Sun, 01 Nov 2015 15:09:35 +0900 Yuya Nishihara hgweb: import wsgicgi at top level
Sun, 01 Nov 2015 15:07:08 +0900 Yuya Nishihara hgweb: import BaseHTTPServer as module at top level
Sun, 01 Nov 2015 14:23:23 +0900 Yuya Nishihara hgweb: do not import hgweb_mod.hgweb and .makebreadcrumb as symbol
Fri, 13 Nov 2015 23:57:43 -0800 Siddharth Agarwal filemerge: don't try using external tools on change/delete conflicts
Fri, 13 Nov 2015 23:56:00 -0800 Siddharth Agarwal filemerge: don't attempt to premerge change/delete conflicts
Fri, 13 Nov 2015 23:58:05 -0800 Siddharth Agarwal filemerge._mergecheck: add check for change/delete conflicts
Sun, 15 Nov 2015 21:40:15 -0800 Siddharth Agarwal filemerge._picktool: only pick from nomerge tools for change/delete conflicts
Fri, 13 Nov 2015 23:52:26 -0800 Siddharth Agarwal filemerge: add support for change/delete conflicts to the ':prompt' tool
Wed, 18 Nov 2015 15:41:50 -0800 Siddharth Agarwal filemerge: add support for change/delete conflicts to the ':other' merge tool
Wed, 18 Nov 2015 15:40:28 -0800 Siddharth Agarwal filemerge: add support for change/delete conflicts to the ':local' merge tool
Thu, 19 Nov 2015 10:50:02 -0800 Siddharth Agarwal merge.mergestate: compute dirstate action
Wed, 18 Nov 2015 14:22:52 -0800 Siddharth Agarwal filemerge: return whether the file was deleted
Wed, 18 Nov 2015 13:55:31 -0800 Siddharth Agarwal filemerge: return whether the file is deleted from all other merge tools
Wed, 18 Nov 2015 13:52:28 -0800 Siddharth Agarwal filemerge: return whether the file is deleted for nomerge internal tools
Wed, 18 Nov 2015 15:46:45 -0800 Siddharth Agarwal mergestate: allow storing and retrieving change/delete conflicts
Thu, 19 Nov 2015 12:50:10 +0530 Shubhanshu Agrawal strip: changing bookmark argument to be a list
Sun, 15 Nov 2015 21:03:44 +0530 Shubhanshu Agrawal strip: strip a list of bookmarks
Wed, 18 Nov 2015 23:23:03 -0800 Pierre-Yves David revset: speed up '_matchfiles'
Wed, 18 Nov 2015 15:46:45 -0800 Siddharth Agarwal mergestate: handle additional record types specially
Wed, 18 Nov 2015 23:42:32 -0800 Siddharth Agarwal test-resolve.t: remove completely unnecessary line
Wed, 18 Nov 2015 23:43:18 -0800 Siddharth Agarwal resolve: fix incorrect merge
Wed, 18 Nov 2015 20:55:32 +0100 liscju fileset: add missing() predicate (issue4925)
Tue, 10 Nov 2015 17:22:40 +0800 Anton Shestakov webutil: make _siblings into an object with __iter__ and __len__
Wed, 18 Nov 2015 16:39:30 -0800 Siddharth Agarwal mergestate: move binary format documentation into _readrecordsv2
Wed, 18 Nov 2015 15:11:23 -0800 Siddharth Agarwal unshelve: add support for custom merge tools
Wed, 18 Nov 2015 15:18:16 -0800 Siddharth Agarwal unshelve: shed spurious space
Wed, 18 Nov 2015 15:04:03 -0800 Siddharth Agarwal unshelve: add -k as short form of --keep
Sun, 01 Nov 2015 13:55:21 +0900 Yuya Nishihara import-checker: allow symbol imports from hgweb.common and .request
Thu, 19 Nov 2015 15:02:27 -0600 Matt Mackall perf: un-bitrot perfstatus
Thu, 19 Nov 2015 13:15:17 -0600 Matt Mackall util: drop statmtimesec
Thu, 19 Nov 2015 13:21:24 -0600 Matt Mackall util: disable floating point stat times (issue4836)
Wed, 18 Nov 2015 15:58:06 -0800 Laurent Charignon rebase: refactoring to avoid repetition of expression
Wed, 18 Nov 2015 16:06:00 -0800 Laurent Charignon rebase: remove an unused todo
Wed, 18 Nov 2015 13:44:29 -0800 Laurent Charignon rebase: don't rebase obsolete commits with no successor
Wed, 18 Nov 2015 13:46:42 -0800 Laurent Charignon rebase: fix a typo in test-rebase-obsolete
Wed, 18 Nov 2015 20:59:17 -0600 Matt Mackall merge with stable
Sun, 01 Nov 2015 14:43:25 +0900 Yuya Nishihara hgweb: unify import style of error classes
Sun, 01 Nov 2015 14:00:14 +0900 Yuya Nishihara hgweb: do not import templatefilters.revescape and websub as symbol
Sun, 01 Nov 2015 13:58:32 +0900 Yuya Nishihara hgweb: alias ui module as uimod
Tue, 17 Nov 2015 14:23:26 -0800 Siddharth Agarwal mergestate.commit: factor out making the list of records
Tue, 17 Nov 2015 14:04:56 -0800 Siddharth Agarwal mergestate: move _read() call to read constructor
Tue, 17 Nov 2015 14:22:30 -0800 Siddharth Agarwal debugmergestate: explain why we create mergestate objects directly
Wed, 11 Nov 2015 13:28:00 -0800 Christian Delahousse debugdirstate: convert keyword parameters to **opts
Tue, 17 Nov 2015 18:01:21 -0800 Christian Delahousse convert: changed test's progress output format to ignore estimate
Tue, 17 Nov 2015 13:12:33 -0800 Laurent Charignon mq: use repo._bookmarks.recordchange instead of repo._bookmarks.write
Tue, 17 Nov 2015 13:12:46 -0800 Laurent Charignon mq: indentation change to make the next patch more legible
Tue, 17 Nov 2015 12:49:57 -0800 Laurent Charignon bookmarks: use repo._bookmarks.recordchange instead of repo._bookmarks.write
Wed, 18 Nov 2015 01:36:58 -0800 Laurent Charignon localrepo: put bookmark move following commit in one transaction
Tue, 17 Nov 2015 15:43:21 -0800 Siddharth Agarwal test-resolve.t: switch to mergestate.read()
Tue, 17 Nov 2015 13:58:50 -0800 Siddharth Agarwal localrepo.commit: switch to mergestate.read()
Tue, 17 Nov 2015 13:57:38 -0800 Siddharth Agarwal fileset: switch to mergestate.read()
Tue, 17 Nov 2015 14:20:55 -0800 Siddharth Agarwal commands.summary: switch to mergestate.read()
Tue, 17 Nov 2015 13:56:46 -0800 Siddharth Agarwal commands.resolve: switch to mergestate.read()
Tue, 17 Nov 2015 13:56:10 -0800 Siddharth Agarwal shelve: switch to mergestate.read()
Tue, 17 Nov 2015 13:55:30 -0800 Siddharth Agarwal mergestate: add a constructor that reads state from disk
Tue, 17 Nov 2015 17:04:53 -0800 Siddharth Agarwal merge.applyupdates: switch to mergestate.clean()
Tue, 17 Nov 2015 17:04:32 -0800 Siddharth Agarwal localrepo: switch to mergestate.clean()
less more | rev 27048: (0) -10000 -3000 -1000 -300 -100 -60 +60 +100 +300 +1000 +3000 +10000 tip