| 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()
|
| Tue, 17 Nov 2015 17:02:35 -0800 |
Siddharth Agarwal |
strip: switch to mergestate.clean()
|
| Tue, 17 Nov 2015 17:00:54 -0800 |
Siddharth Agarwal |
mergestate: add a constructor that sets up a clean merge state
|
| Tue, 17 Nov 2015 14:11:52 -0800 |
Siddharth Agarwal |
mergestate: raise structured exception for unsupported merge records
|
| Tue, 17 Nov 2015 14:10:12 -0800 |
Siddharth Agarwal |
error: add a structured exception for unsupported merge records
|
| Tue, 17 Nov 2015 13:47:16 -0800 |
Bryan O'Sullivan |
dirstate: back out 502b56a9e897
|
| Tue, 17 Nov 2015 13:47:14 -0800 |
Bryan O'Sullivan |
osutil: make statfiles check for interrupts periodically
|
| Tue, 17 Nov 2015 13:43:09 -0800 |
Bryan O'Sullivan |
osutil: don't leak on statfiles error
|
| Thu, 12 Nov 2015 12:44:15 +0100 |
liscju |
histedit: extracts _isdirtywc function
|
| Mon, 16 Nov 2015 11:23:32 -0800 |
Siddharth Agarwal |
node: add 'nullhex', hex-encoded nullid
|
| Mon, 16 Nov 2015 11:45:35 -0800 |
Siddharth Agarwal |
filemerge: introduce class whose objects represent files not in a context
|
| Mon, 16 Nov 2015 11:27:27 -0800 |
Siddharth Agarwal |
filectx: add isabsent method
|
| Fri, 13 Nov 2015 22:37:51 -0800 |
Siddharth Agarwal |
filectx: allow custom comparators
|
| Fri, 13 Nov 2015 23:01:36 -0800 |
Siddharth Agarwal |
debugmergestate: print out record type for files
|
| Sun, 15 Nov 2015 22:45:20 -0800 |
Siddharth Agarwal |
merge.applyupdates: don't return early if merge driver's conclude failed
|
| Mon, 16 Nov 2015 17:15:36 -0800 |
Laurent Charignon |
convert: use repo._bookmarks.recordchange instead of repo._bookmarks.write
|
| Mon, 16 Nov 2015 17:14:15 -0800 |
Laurent Charignon |
convert: indentation change to make the next patch more legible
|
| Sun, 15 Nov 2015 20:27:27 +0530 |
Shubhanshu Agrawal |
strip: renaming local variables
|
| Wed, 11 Feb 2015 22:22:29 -0800 |
Martin von Zweigbergk |
test-rename-merge2: make selected output less arbitrary
|
| Sun, 15 Nov 2015 22:11:23 -0500 |
Matt Harbison |
test-convert-git: drop a git warning that doesn't occur on Windows
|
| Sun, 15 Nov 2015 21:12:13 -0500 |
Matt Harbison |
tests: fix globs for Windows
|
| Sun, 15 Nov 2015 22:58:28 +0100 |
liscju |
pull: return 255 value on update failure (issue4948) (BC)
|
| Wed, 11 Nov 2015 10:19:11 -0800 |
Martin von Zweigbergk |
filemerge: remove leading space from " no tool found..."
|
| Mon, 09 Nov 2015 22:31:01 +0900 |
Yuya Nishihara |
test-encoding: enable fuzz testing of utf8b roundtrip
|
| Sun, 01 Nov 2015 17:42:03 +0900 |
Yuya Nishihara |
import-checker: reset context to verify convention in function scope
|
| Sun, 01 Nov 2015 00:37:22 +0900 |
Yuya Nishihara |
import-checker: allow import of child modules from package root
|
| Mon, 02 Nov 2015 17:17:33 -0600 |
Matt Mackall |
encoding: extend test cases for utf8b
|
| Fri, 13 Nov 2015 22:43:09 -0800 |
Siddharth Agarwal |
merge: make 'cd' and 'dc' actions store the same arguments as 'm'
|
| Fri, 13 Nov 2015 14:24:22 -0800 |
Siddharth Agarwal |
merge: stop emptying out 'cd' and 'dc' actions
|
| Sun, 15 Nov 2015 22:18:48 +0100 |
liscju |
rebase: add returning value from pullrebase function
stable
|
| Fri, 13 Nov 2015 15:56:02 -0800 |
Siddharth Agarwal |
resolve: restore .orig only after merge is fully complete (issue4952)
stable
|
| Fri, 06 Nov 2015 22:32:00 +0800 |
Anton Shestakov |
monoblue: add a space to separate navigation links in file log footer
|
| Thu, 12 Nov 2015 13:14:03 -0800 |
Martin von Zweigbergk |
merge: move messages about possible conflicts a litte earlier
|
| Sun, 01 Nov 2015 15:46:06 +0900 |
Yuya Nishihara |
import-checker: include lineno in warning message
|
| Sun, 01 Nov 2015 15:39:25 +0900 |
Yuya Nishihara |
import-checker: extract function to generate a formatted warning
|
| Sun, 01 Nov 2015 13:53:05 +0900 |
Yuya Nishihara |
import-checker: make it executable for convenience
|
| Mon, 09 Nov 2015 17:20:50 -0500 |
Matt Harbison |
test-fileset: glob the updated file count for Windows stability
|
| Mon, 09 Nov 2015 13:12:35 -0500 |
Matt Harbison |
tests: tolerate differences between Linux and Windows error strings
|
| Mon, 09 Nov 2015 12:51:58 -0500 |
Matt Harbison |
test-largefiles-cache: add glob for Windows
|
| Mon, 09 Nov 2015 12:49:31 -0500 |
Matt Harbison |
tests: make 'f' tool open files in binary mode when hexdumping
|
| Thu, 12 Nov 2015 14:29:02 -0800 |
Siddharth Agarwal |
merge.applyupdates: only attempt to merge files in mergeactions
|
| Wed, 11 Nov 2015 17:34:28 -0800 |
Siddharth Agarwal |
filemerge: rename _symlinkcheck to _mergecheck
|
| Wed, 11 Nov 2015 17:32:41 -0800 |
Siddharth Agarwal |
test-merge-prompt.t: rename to test-merge-changedelete.t
|
| Thu, 12 Nov 2015 20:48:41 -0600 |
Matt Mackall |
merge with stable
|
| Thu, 12 Nov 2015 13:16:04 -0800 |
Gregory Szorc |
tags: create new sortdict for performance reasons
stable
|
| Tue, 10 Nov 2015 15:08:56 -0800 |
Christian Delahousse |
largefiles: specify where .orig files are kept
|
| Tue, 10 Nov 2015 14:52:54 -0800 |
Christian Delahousse |
mq: let the user choose where .orig files are kept
|
| Tue, 10 Nov 2015 14:41:14 -0800 |
Christian Delahousse |
shelve: choose where .orig file locations are kept
|
| Tue, 10 Nov 2015 16:25:59 -0800 |
Christian Delahousse |
filemerge: choose where .orig files are kept
|
| Tue, 10 Nov 2015 14:29:13 -0800 |
Christian Delahousse |
git-subrepos: revert respects specified location to save .orig files
|
| Tue, 10 Nov 2015 14:26:19 -0800 |
Christian Delahousse |
resolve: choose where .orig file locations are kept
|
| Thu, 12 Nov 2015 17:00:08 -0600 |
Christian Delahousse |
revert: allow configuring the .orig file location
|
| Thu, 12 Nov 2015 16:56:06 -0600 |
Christian Delahousse |
cmdutil: add origbackuppath helper
|
| Tue, 10 Nov 2015 11:16:25 -0800 |
Ryan McElroy |
discovery: pass pushop to _nowarnheads
|
| Tue, 10 Nov 2015 11:13:21 -0800 |
Ryan McElroy |
exchange: pass pushop to discovery.checkheads
|
| Thu, 12 Nov 2015 15:26:30 -0600 |
Matt Mackall |
merge with stable
|
| Fri, 13 Nov 2015 02:36:30 +0900 |
FUJIWARA Katsunori |
share: wrap bmstore._writerepo for transaction sensitivity (issue4940)
stable
|
| Sat, 07 Nov 2015 13:48:42 -0500 |
Pierre-Yves David |
test: use generaldelta in 'test-clonebundle.t'
|
| Tue, 20 Oct 2015 13:14:04 +0200 |
Pierre-Yves David |
test: use generaldelta in 'test-ssh.t'
|
| Tue, 20 Oct 2015 13:14:31 +0200 |
Pierre-Yves David |
test: use generaldelta in 'test-ssh-bundle1.t'
|
| Tue, 20 Oct 2015 13:09:43 +0200 |
Pierre-Yves David |
test: use generaldelta in 'test-strip.t'
|
| Tue, 20 Oct 2015 12:39:49 +0200 |
Pierre-Yves David |
test: use generaldelta in 'test-rebase-newancestors.t'
|
| Tue, 20 Oct 2015 12:09:18 +0200 |
Pierre-Yves David |
test: use general delta for 'test-commit-amend.t'
|
| Tue, 20 Oct 2015 11:50:55 +0200 |
Pierre-Yves David |
test: wider matching in 'test-clone-r.t'
|
| Tue, 20 Oct 2015 11:48:49 +0200 |
Pierre-Yves David |
test: use generaldelta in 'test-bundle-type.t'
|
| Tue, 20 Oct 2015 10:46:59 +0200 |
Pierre-Yves David |
test: use generaldelta in 'test-patchbomb.t'
|
| Tue, 20 Oct 2015 10:37:07 +0200 |
Pierre-Yves David |
test: use generaldelta for test-bundle.t
|
| Tue, 20 Oct 2015 03:14:36 +0200 |
Pierre-Yves David |
test: use generaldelta in 'test-rebase-conflict.t'
|
| Mon, 19 Oct 2015 15:25:58 +0200 |
Pierre-Yves David |
tests: test generaldelta configuration in test-init.t
|
| Mon, 19 Oct 2015 11:28:31 +0200 |
Pierre-Yves David |
test: enable generaldelta early in 'test-treemanifest.t'
|
| Mon, 19 Oct 2015 10:48:02 +0200 |
Pierre-Yves David |
test: enable generaldelta in 'test-copy.t'
|
| Sun, 18 Oct 2015 19:04:29 +0200 |
Pierre-Yves David |
test: enable generaldelta in 'test-debugcommand.t'
|
| Sun, 18 Oct 2015 18:55:32 +0200 |
Pierre-Yves David |
test: use generaldelta in test-manifestv2.t
|
| Sun, 18 Oct 2015 18:36:39 +0200 |
Pierre-Yves David |
test: explicitly use generaldelta in 'test-rebase-mq-skip.t'
|
| Fri, 16 Oct 2015 02:54:52 +0100 |
Pierre-Yves David |
test: using generaldelta in 'test-lfconvert.t'
|
| Thu, 12 Nov 2015 02:52:19 -0800 |
Pierre-Yves David |
test: enforce generaldelta format with the right option
|
| Sat, 07 Nov 2015 13:53:11 -0500 |
Pierre-Yves David |
test: enforce non-generaldelta base repository in 'test-generaldelta'
|
| Tue, 20 Oct 2015 12:25:51 +0200 |
Pierre-Yves David |
test: use generaldelta in 'test-hgweb-command.t'
|
| Tue, 20 Oct 2015 12:28:42 +0200 |
Pierre-Yves David |
stream: sort stream capability before serialisation
|
| Tue, 20 Oct 2015 12:25:09 +0200 |
Pierre-Yves David |
test: spread capabilities replies in 'test-hgweb-commands'
|
| Sat, 07 Nov 2015 16:11:49 -0800 |
Durham Goode |
phase: improve retractboundary perf
|
| Thu, 12 Nov 2015 13:51:09 -0600 |
Matt Mackall |
merge with stable
|
| Mon, 02 Nov 2015 15:59:12 +0000 |
Pierre-Yves David |
format: introduce 'format.usegeneraldelta`
|
| Mon, 02 Nov 2015 16:52:34 +0000 |
Pierre-Yves David |
scmutil: extract general delta config handling in a function
|
| Tue, 10 Nov 2015 09:58:10 -0800 |
Danek Duvall |
test: test-bundle-type.t needs to work more universally
stable
|
| Tue, 10 Nov 2015 19:52:30 +0800 |
Anton Shestakov |
bash_completion: add -p|--patch|--stat support for shelve
|
| Sun, 08 Nov 2015 18:34:36 -0500 |
Matt Harbison |
test-convert-git: silence commit output for stablity
|
| Sun, 08 Nov 2015 17:56:48 -0500 |
Matt Harbison |
rebase: preserve the 'intermediate-source' attribute of grafts
|
| Wed, 11 Nov 2015 15:08:08 -0600 |
Matt Mackall |
merge with stable
|
| Wed, 04 Nov 2015 12:14:18 -0500 |
Augie Fackler |
verify: add a hook that can let extensions manipulate file lists
|
| Tue, 10 Nov 2015 17:16:59 -0800 |
Siddharth Agarwal |
resolve: don't abort when file is missing
|
| Tue, 10 Nov 2015 17:13:16 -0800 |
Siddharth Agarwal |
filemerge: treat EOF at prompt as fail, not abort
|
| Tue, 10 Nov 2015 17:10:47 -0800 |
Siddharth Agarwal |
test-merge-tools.t: add 'hg resolve --list' output to tests
|
| Tue, 10 Nov 2015 00:46:45 -0800 |
Siddharth Agarwal |
error: add structured exception for EOF at prompt
|
| Mon, 09 Nov 2015 22:37:32 -0800 |
Siddharth Agarwal |
test-merge-prompt.t: unset HGMERGE
|
| Tue, 10 Nov 2015 23:02:59 +0800 |
Anton Shestakov |
hgweb: compute changeset parents and children for log pages lazily
|
| Sun, 08 Nov 2015 23:42:44 -0800 |
Siddharth Agarwal |
filemerge: move :merge-local/other symlink check to precheck
|
| Sun, 08 Nov 2015 23:47:20 -0800 |
Siddharth Agarwal |
test-merge-types.t: add tests for :merge-local/:merge-other with symlinks
|
| Mon, 09 Nov 2015 16:24:13 -0600 |
Matt Mackall |
Added signature for changeset 1aa5083cbebb
stable
|
| Mon, 09 Nov 2015 16:24:08 -0600 |
Matt Mackall |
Added tag 3.6.1 for changeset 1aa5083cbebb
stable
|
| Mon, 09 Nov 2015 15:53:11 -0600 |
Matt Mackall |
posix: fix test-permissions regression
stable 3.6.1
|
| Sun, 08 Nov 2015 01:10:52 +0800 |
Anton Shestakov |
dockerlib: allow non-unique uid and gid of $DBUILDUSER (issue4657)
stable
|
| Mon, 09 Nov 2015 10:43:23 -0800 |
Mateusz Kwapich |
dirstate: fix filefoldmap incosistency on file delete
stable
|
| Mon, 09 Nov 2015 09:41:20 -0600 |
Steve Borho |
wix: style-coal.css has been renamed
stable
|
| Mon, 09 Nov 2015 12:49:21 -0600 |
Matt Mackall |
merge with stable
|
| Thu, 05 Nov 2015 10:31:20 +0000 |
Javi Merino |
clonebundles: fix typo s/comand/command/
stable
|
| Fri, 06 Nov 2015 15:23:10 -0600 |
Matt Mackall |
posix: retry on symlink race in checklink
stable
|
| Fri, 06 Nov 2015 13:01:15 -0500 |
Pierre-Yves David |
changegroup: back code change of e7c618cee8df out
stable
|
| Fri, 06 Nov 2015 12:59:09 -0500 |
Pierre-Yves David |
changegroup: call 'prechangegroup' hook before setting up write delay
stable
|
| Fri, 06 Nov 2015 12:39:06 -0500 |
Pierre-Yves David |
changegroup: fix the scope of a try finally
stable
|
| Thu, 05 Nov 2015 17:30:10 -0600 |
Matt Mackall |
encoding: re-escape U+DCxx characters in toutf8b input (issue4927)
|
| Thu, 05 Nov 2015 17:21:43 -0600 |
Matt Mackall |
encoding: use getutf8char in toutf8b
|
