Mercurial > hg
graph
-
filemerge: don't try using external tools on change/delete conflictsFri, 13 Nov 2015 23:57:43 -0800, by Siddharth Agarwal
-
filemerge: don't attempt to premerge change/delete conflictsFri, 13 Nov 2015 23:56:00 -0800, by Siddharth Agarwal
-
filemerge._mergecheck: add check for change/delete conflictsFri, 13 Nov 2015 23:58:05 -0800, by Siddharth Agarwal
-
filemerge._picktool: only pick from nomerge tools for change/delete conflictsSun, 15 Nov 2015 21:40:15 -0800, by Siddharth Agarwal
-
filemerge: add support for change/delete conflicts to the ':prompt' toolFri, 13 Nov 2015 23:52:26 -0800, by Siddharth Agarwal
-
filemerge: add support for change/delete conflicts to the ':other' merge toolWed, 18 Nov 2015 15:41:50 -0800, by Siddharth Agarwal
-
filemerge: add support for change/delete conflicts to the ':local' merge toolWed, 18 Nov 2015 15:40:28 -0800, by Siddharth Agarwal
-
merge.mergestate: compute dirstate actionThu, 19 Nov 2015 10:50:02 -0800, by Siddharth Agarwal
-
filemerge: return whether the file was deletedWed, 18 Nov 2015 14:22:52 -0800, by Siddharth Agarwal
-
filemerge: return whether the file is deleted from all other merge toolsWed, 18 Nov 2015 13:55:31 -0800, by Siddharth Agarwal
-
filemerge: return whether the file is deleted for nomerge internal toolsWed, 18 Nov 2015 13:52:28 -0800, by Siddharth Agarwal
-
mergestate: allow storing and retrieving change/delete conflictsWed, 18 Nov 2015 15:46:45 -0800, by Siddharth Agarwal
-
strip: changing bookmark argument to be a listThu, 19 Nov 2015 12:50:10 +0530, by Shubhanshu Agrawal
-
strip: strip a list of bookmarksSun, 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 speciallyWed, 18 Nov 2015 15:46:45 -0800, by Siddharth Agarwal
-
test-resolve.t: remove completely unnecessary lineWed, 18 Nov 2015 23:42:32 -0800, by Siddharth Agarwal
-
resolve: fix incorrect mergeWed, 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 _readrecordsv2Wed, 18 Nov 2015 16:39:30 -0800, by Siddharth Agarwal
-
unshelve: add support for custom merge toolsWed, 18 Nov 2015 15:11:23 -0800, by Siddharth Agarwal
-
unshelve: shed spurious spaceWed, 18 Nov 2015 15:18:16 -0800, by Siddharth Agarwal
-
unshelve: add -k as short form of --keepWed, 18 Nov 2015 15:04:03 -0800, by Siddharth Agarwal
-
import-checker: allow symbol imports from hgweb.common and .requestSun, 01 Nov 2015 13:55:21 +0900, by Yuya Nishihara
-
perf: un-bitrot perfstatusThu, 19 Nov 2015 15:02:27 -0600, by Matt Mackall
-
util: drop statmtimesecThu, 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 expressionWed, 18 Nov 2015 15:58:06 -0800, by Laurent Charignon
-
rebase: remove an unused todoWed, 18 Nov 2015 16:06:00 -0800, by Laurent Charignon
-
rebase: don't rebase obsolete commits with no successorWed, 18 Nov 2015 13:44:29 -0800, by Laurent Charignon
-
rebase: fix a typo in test-rebase-obsoleteWed, 18 Nov 2015 13:46:42 -0800, by Laurent Charignon
-
merge with stableWed, 18 Nov 2015 20:59:17 -0600, by Matt Mackall
-
hgweb: unify import style of error classesSun, 01 Nov 2015 14:43:25 +0900, by Yuya Nishihara
-
hgweb: do not import templatefilters.revescape and websub as symbolSun, 01 Nov 2015 14:00:14 +0900, by Yuya Nishihara
-
hgweb: alias ui module as uimodSun, 01 Nov 2015 13:58:32 +0900, by Yuya Nishihara
-
mergestate.commit: factor out making the list of recordsTue, 17 Nov 2015 14:23:26 -0800, by Siddharth Agarwal
-
mergestate: move _read() call to read constructorTue, 17 Nov 2015 14:04:56 -0800, by Siddharth Agarwal
-
debugmergestate: explain why we create mergestate objects directlyTue, 17 Nov 2015 14:22:30 -0800, by Siddharth Agarwal
-
debugdirstate: convert keyword parameters to **optsWed, 11 Nov 2015 13:28:00 -0800, by Christian Delahousse
-
convert: changed test's progress output format to ignore estimateTue, 17 Nov 2015 18:01:21 -0800, by Christian Delahousse
-
mq: use repo._bookmarks.recordchange instead of repo._bookmarks.writeTue, 17 Nov 2015 13:12:33 -0800, by Laurent Charignon
-
mq: indentation change to make the next patch more legibleTue, 17 Nov 2015 13:12:46 -0800, by Laurent Charignon
-
bookmarks: use repo._bookmarks.recordchange instead of repo._bookmarks.writeTue, 17 Nov 2015 12:49:57 -0800, by Laurent Charignon
-
localrepo: put bookmark move following commit in one transactionWed, 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 diskTue, 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 stateTue, 17 Nov 2015 17:00:54 -0800, by Siddharth Agarwal
-
mergestate: raise structured exception for unsupported merge recordsTue, 17 Nov 2015 14:11:52 -0800, by Siddharth Agarwal
-
error: add a structured exception for unsupported merge recordsTue, 17 Nov 2015 14:10:12 -0800, by Siddharth Agarwal
-
dirstate: back out 502b56a9e897Tue, 17 Nov 2015 13:47:16 -0800, by Bryan O'Sullivan
-
osutil: make statfiles check for interrupts periodicallyTue, 17 Nov 2015 13:47:14 -0800, by Bryan O'Sullivan
-
osutil: don't leak on statfiles errorTue, 17 Nov 2015 13:43:09 -0800, by Bryan O'Sullivan
-
histedit: extracts _isdirtywc functionThu, 12 Nov 2015 12:44:15 +0100, by liscju
-
node: add 'nullhex', hex-encoded nullidMon, 16 Nov 2015 11:23:32 -0800, by Siddharth Agarwal
-
filemerge: introduce class whose objects represent files not in a contextMon, 16 Nov 2015 11:45:35 -0800, by Siddharth Agarwal