| 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
|
