Mercurial: revision graph

graph

less more | rev 26997: (0) -10000 -3000 -1000 -120 +120 +1000 +3000 +10000 tip

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
discovery: pass pushop to _nowarnheads
Tue, 10 Nov 2015 11:16:25 -0800, by Ryan McElroy
exchange: pass pushop to discovery.checkheads
Tue, 10 Nov 2015 11:13:21 -0800, by Ryan McElroy
merge with stable
Thu, 12 Nov 2015 15:26:30 -0600, by Matt Mackall
share: wrap bmstore._writerepo for transaction sensitivity (issue4940) stable
Fri, 13 Nov 2015 02:36:30 +0900, by FUJIWARA Katsunori
test: use generaldelta in 'test-clonebundle.t'
Sat, 07 Nov 2015 13:48:42 -0500, by Pierre-Yves David
test: use generaldelta in 'test-ssh.t'
Tue, 20 Oct 2015 13:14:04 +0200, by Pierre-Yves David
test: use generaldelta in 'test-ssh-bundle1.t'
Tue, 20 Oct 2015 13:14:31 +0200, by Pierre-Yves David
test: use generaldelta in 'test-strip.t'
Tue, 20 Oct 2015 13:09:43 +0200, by Pierre-Yves David
test: use generaldelta in 'test-rebase-newancestors.t'
Tue, 20 Oct 2015 12:39:49 +0200, by Pierre-Yves David
test: use general delta for 'test-commit-amend.t'
Tue, 20 Oct 2015 12:09:18 +0200, by Pierre-Yves David
test: wider matching in 'test-clone-r.t'
Tue, 20 Oct 2015 11:50:55 +0200, by Pierre-Yves David
test: use generaldelta in 'test-bundle-type.t'
Tue, 20 Oct 2015 11:48:49 +0200, by Pierre-Yves David
test: use generaldelta in 'test-patchbomb.t'
Tue, 20 Oct 2015 10:46:59 +0200, by Pierre-Yves David
test: use generaldelta for test-bundle.t
Tue, 20 Oct 2015 10:37:07 +0200, by Pierre-Yves David
test: use generaldelta in 'test-rebase-conflict.t'
Tue, 20 Oct 2015 03:14:36 +0200, by Pierre-Yves David
tests: test generaldelta configuration in test-init.t
Mon, 19 Oct 2015 15:25:58 +0200, by Pierre-Yves David
test: enable generaldelta early in 'test-treemanifest.t'
Mon, 19 Oct 2015 11:28:31 +0200, by Pierre-Yves David
test: enable generaldelta in 'test-copy.t'
Mon, 19 Oct 2015 10:48:02 +0200, by Pierre-Yves David
test: enable generaldelta in 'test-debugcommand.t'
Sun, 18 Oct 2015 19:04:29 +0200, by Pierre-Yves David
test: use generaldelta in test-manifestv2.t
Sun, 18 Oct 2015 18:55:32 +0200, by Pierre-Yves David
test: explicitly use generaldelta in 'test-rebase-mq-skip.t'
Sun, 18 Oct 2015 18:36:39 +0200, by Pierre-Yves David
test: using generaldelta in 'test-lfconvert.t'
Fri, 16 Oct 2015 02:54:52 +0100, by Pierre-Yves David
test: enforce generaldelta format with the right option
Thu, 12 Nov 2015 02:52:19 -0800, by Pierre-Yves David
test: enforce non-generaldelta base repository in 'test-generaldelta'
Sat, 07 Nov 2015 13:53:11 -0500, by Pierre-Yves David
test: use generaldelta in 'test-hgweb-command.t'
Tue, 20 Oct 2015 12:25:51 +0200, by Pierre-Yves David
stream: sort stream capability before serialisation
Tue, 20 Oct 2015 12:28:42 +0200, by Pierre-Yves David
test: spread capabilities replies in 'test-hgweb-commands'
Tue, 20 Oct 2015 12:25:09 +0200, by Pierre-Yves David
phase: improve retractboundary perf
Sat, 07 Nov 2015 16:11:49 -0800, by Durham Goode
merge with stable
Thu, 12 Nov 2015 13:51:09 -0600, by Matt Mackall
format: introduce 'format.usegeneraldelta`
Mon, 02 Nov 2015 15:59:12 +0000, by Pierre-Yves David
scmutil: extract general delta config handling in a function
Mon, 02 Nov 2015 16:52:34 +0000, by Pierre-Yves David
test: test-bundle-type.t needs to work more universally stable
Tue, 10 Nov 2015 09:58:10 -0800, by Danek Duvall
bash_completion: add -p|--patch|--stat support for shelve
Tue, 10 Nov 2015 19:52:30 +0800, by Anton Shestakov
test-convert-git: silence commit output for stablity
Sun, 08 Nov 2015 18:34:36 -0500, by Matt Harbison
rebase: preserve the 'intermediate-source' attribute of grafts
Sun, 08 Nov 2015 17:56:48 -0500, by Matt Harbison
merge with stable
Wed, 11 Nov 2015 15:08:08 -0600, by Matt Mackall
verify: add a hook that can let extensions manipulate file lists
Wed, 04 Nov 2015 12:14:18 -0500, by Augie Fackler
resolve: don't abort when file is missing
Tue, 10 Nov 2015 17:16:59 -0800, by Siddharth Agarwal
filemerge: treat EOF at prompt as fail, not abort
Tue, 10 Nov 2015 17:13:16 -0800, by Siddharth Agarwal
test-merge-tools.t: add 'hg resolve --list' output to tests
Tue, 10 Nov 2015 17:10:47 -0800, by Siddharth Agarwal
error: add structured exception for EOF at prompt
Tue, 10 Nov 2015 00:46:45 -0800, by Siddharth Agarwal
test-merge-prompt.t: unset HGMERGE
Mon, 09 Nov 2015 22:37:32 -0800, by Siddharth Agarwal
hgweb: compute changeset parents and children for log pages lazily
Tue, 10 Nov 2015 23:02:59 +0800, by Anton Shestakov
filemerge: move :merge-local/other symlink check to precheck
Sun, 08 Nov 2015 23:42:44 -0800, by Siddharth Agarwal
test-merge-types.t: add tests for :merge-local/:merge-other with symlinks
Sun, 08 Nov 2015 23:47:20 -0800, by Siddharth Agarwal
Added signature for changeset 1aa5083cbebb stable
Mon, 09 Nov 2015 16:24:13 -0600, by Matt Mackall
Added tag 3.6.1 for changeset 1aa5083cbebb stable
Mon, 09 Nov 2015 16:24:08 -0600, by Matt Mackall
posix: fix test-permissions regression stable 3.6.1
Mon, 09 Nov 2015 15:53:11 -0600, by Matt Mackall
dockerlib: allow non-unique uid and gid of $DBUILDUSER (issue4657) stable
Sun, 08 Nov 2015 01:10:52 +0800, by Anton Shestakov
dirstate: fix filefoldmap incosistency on file delete stable
Mon, 09 Nov 2015 10:43:23 -0800, by Mateusz Kwapich
wix: style-coal.css has been renamed stable
Mon, 09 Nov 2015 09:41:20 -0600, by Steve Borho
merge with stable
Mon, 09 Nov 2015 12:49:21 -0600, by Matt Mackall
clonebundles: fix typo s/comand/command/ stable
Thu, 05 Nov 2015 10:31:20 +0000, by Javi Merino
posix: retry on symlink race in checklink stable
Fri, 06 Nov 2015 15:23:10 -0600, by Matt Mackall
changegroup: back code change of e7c618cee8df out stable
Fri, 06 Nov 2015 13:01:15 -0500, by Pierre-Yves David
changegroup: call 'prechangegroup' hook before setting up write delay stable
Fri, 06 Nov 2015 12:59:09 -0500, by Pierre-Yves David
changegroup: fix the scope of a try finally stable
Fri, 06 Nov 2015 12:39:06 -0500, by Pierre-Yves David
encoding: re-escape U+DCxx characters in toutf8b input (issue4927)
Thu, 05 Nov 2015 17:30:10 -0600, by Matt Mackall
encoding: use getutf8char in toutf8b
Thu, 05 Nov 2015 17:21:43 -0600, by Matt Mackall

less more | rev 26997: (0) -10000 -3000 -1000 -120 +120 +1000 +3000 +10000 tip

Mercurial > hg

graph