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