Fri, 02 Oct 2015 23:21:39 -0700 |
Pierre-Yves David |
bundle2: make unbundle.compressed return True when compressed
|
Mon, 19 Oct 2015 18:04:08 +0200 |
Pierre-Yves David |
bundlerepo: uncompress changegroup in bundle1 case only
|
Mon, 19 Oct 2015 17:58:04 +0200 |
Pierre-Yves David |
bundlerepo: move temp-bundle writing logic into a closure
|
Mon, 19 Oct 2015 15:42:50 +0200 |
Pierre-Yves David |
shelve: properly process bundle2 bundle
|
Tue, 20 Oct 2015 03:07:23 +0200 |
Pierre-Yves David |
histedit: properly apply bundle2 backups
|
Tue, 20 Oct 2015 16:01:33 +0200 |
Pierre-Yves David |
strip: pass source and url to bundle2 processing
|
Tue, 20 Oct 2015 15:56:22 +0200 |
Pierre-Yves David |
unbundle: use 'url' argument with applybundle
|
Tue, 20 Oct 2015 15:55:04 +0200 |
Pierre-Yves David |
applybundle: take url as argument
|
Tue, 20 Oct 2015 15:53:07 +0200 |
Pierre-Yves David |
unbundle: use 'source' argument with applybundle
|
Tue, 20 Oct 2015 15:52:42 +0200 |
Pierre-Yves David |
applybundle: take source as argument
|
Tue, 20 Oct 2015 15:48:24 +0200 |
Pierre-Yves David |
applybundle: set 'bundle2=1' env for all transaction
|
Tue, 20 Oct 2015 15:47:20 +0200 |
Pierre-Yves David |
unbundle: use 'bundle2.applybundle'
|
Tue, 20 Oct 2015 15:45:39 +0200 |
Pierre-Yves David |
bundle2: introduce an "applybundle" function
|
Thu, 15 Oct 2015 01:31:04 -0700 |
Siddharth Agarwal |
commands.resolve: conclude merge driver if no unresolved files are left
|
Thu, 15 Oct 2015 01:27:06 -0700 |
Siddharth Agarwal |
commands.resolve: call driverpreprocess if we haven't run it yet
|
Thu, 15 Oct 2015 01:22:01 -0700 |
Siddharth Agarwal |
merge.applyupdates: call driverconclude after performing merge actions
|
Thu, 15 Oct 2015 01:19:10 -0700 |
Siddharth Agarwal |
merge.applyupdates: call driverpreprocess before starting merge actions
|
Thu, 15 Oct 2015 01:17:29 -0700 |
Siddharth Agarwal |
merge: add stubs for preprocess and conclude steps of merge driver
|
Thu, 15 Oct 2015 01:15:22 -0700 |
Siddharth Agarwal |
commands.resolve: don't allow users to mark or unmark driver-resolved files
|
Thu, 15 Oct 2015 01:11:50 -0700 |
Siddharth Agarwal |
resolve: only create wctx once
|
Mon, 19 Oct 2015 12:07:17 -0700 |
James Mills |
dirstate: fix invalid reference to self.ui
|
Sat, 17 Oct 2015 00:58:46 +0200 |
Mads Kiilerich |
spelling: trivial spell checking
|
Wed, 14 Oct 2015 03:30:27 -0400 |
timeless |
mq: consistently use qrefresh
|
Wed, 14 Oct 2015 02:06:54 -0400 |
timeless |
grammar: use does instead of do where appropriate
|
Wed, 14 Oct 2015 22:29:03 -0400 |
timeless |
l10n: use %d instead of %s for numbers
|
Thu, 15 Oct 2015 20:36:12 -0400 |
timeless |
check-code: block non-portable pipe-and
|
Thu, 15 Oct 2015 20:32:01 -0400 |
timeless |
test-shelve: do not use non-portable pipe-and
|
Sun, 18 Oct 2015 09:05:04 +0900 |
Yuya Nishihara |
parsers: suppress warning of signed and unsigned comparison at nt_init
|
Sat, 17 Oct 2015 23:14:13 +0900 |
Yuya Nishihara |
parsers: correct type of temporary variables for dirstate tuple fields
|
Fri, 16 Oct 2015 02:53:57 +0100 |
Pierre-Yves David |
test: enforce v1 type in 'test-bundle2-remote-changegroup.t'
|
Fri, 16 Oct 2015 02:51:34 +0100 |
Pierre-Yves David |
test: enforce v1 type in 'test-bundle2-format.t'
|
Sat, 17 Oct 2015 15:48:14 -0700 |
Ryan McElroy |
editmerge: properly quote variables
|
Thu, 15 Oct 2015 01:09:58 -0700 |
Siddharth Agarwal |
commands.resolve: print out warning when only driver-resolved files remain
|
Thu, 15 Oct 2015 01:06:29 -0700 |
Siddharth Agarwal |
merge.mergestate: set merge driver state to 's' if there's none present
|
Thu, 15 Oct 2015 01:04:46 -0700 |
Siddharth Agarwal |
merge.mergestate: only check for merge driver when property is accessed
|
Thu, 15 Oct 2015 01:02:32 -0700 |
Siddharth Agarwal |
localrepo.commit: abort if merge driver's conclude step hasn't been run yet
|
Thu, 15 Oct 2015 00:57:56 -0700 |
Siddharth Agarwal |
merge.mergestate: add a way to get the merge driver state
|
Thu, 15 Oct 2015 00:49:07 -0700 |
Siddharth Agarwal |
merge.mergestate: add a way to get the other side of the merge
|
Thu, 15 Oct 2015 00:45:20 -0700 |
Siddharth Agarwal |
commands.resolve: support printing out driver-resolved files
|
Sat, 17 Oct 2015 12:32:23 -0700 |
Durham Goode |
histedit: make histedit prune when obsolete is enabled
|
Sat, 17 Oct 2015 11:23:54 -0700 |
Gregory Szorc |
clonebundles: rewrite documentation
|
Sat, 17 Oct 2015 11:37:08 -0700 |
Gregory Szorc |
exchange: support streaming clone bundles in clone bundles
|
Sat, 17 Oct 2015 10:26:34 -0700 |
Gregory Szorc |
exchange: parse requirements from stream clone specification string
|
Wed, 14 Oct 2015 17:00:34 -0700 |
Gregory Szorc |
exchange: support parameters in bundle specification strings
|
Thu, 15 Oct 2015 13:43:18 -0700 |
Gregory Szorc |
commands: support consuming stream clone bundles
|
Sat, 17 Oct 2015 11:40:29 -0700 |
Gregory Szorc |
commands: support creating stream clone bundles
|
Thu, 15 Oct 2015 13:00:45 -0700 |
Gregory Szorc |
exchange: support for streaming clone bundles
|
Sat, 17 Oct 2015 11:14:52 -0700 |
Gregory Szorc |
streamclone: support for producing and consuming stream clone bundles
|
Sat, 17 Oct 2015 15:28:02 -0500 |
Matt Mackall |
spelling: fix typo in transaction error messages
|
Fri, 16 Oct 2015 03:29:51 +0900 |
FUJIWARA Katsunori |
transaction: reorder unlinking .hg/journal and .hg/journal.backupfiles
|
Sat, 17 Oct 2015 01:15:34 +0900 |
FUJIWARA Katsunori |
merge: make in-memory changes visible to external update hooks
|
Sat, 17 Oct 2015 01:15:34 +0900 |
FUJIWARA Katsunori |
hook: centralize passing HG_PENDING to external hook process
|
Sat, 17 Oct 2015 01:15:34 +0900 |
FUJIWARA Katsunori |
cmdutil: make in-memory changes visible to external editor (issue4378)
|
Sat, 17 Oct 2015 01:15:34 +0900 |
FUJIWARA Katsunori |
dirstate: show develwarn for write() invocation without transaction
|
Sat, 17 Oct 2015 01:15:34 +0900 |
FUJIWARA Katsunori |
dirstate: make dirstate.write() callers pass transaction object to it
|
Sat, 17 Oct 2015 01:15:34 +0900 |
FUJIWARA Katsunori |
dirstate: remove layering violation around writing dirstate out
|
Sat, 17 Oct 2015 01:15:33 +0900 |
FUJIWARA Katsunori |
dirstateguard: remove layering violation around saving/restoring backup
|
Thu, 15 Oct 2015 15:20:44 -0700 |
Christian Delahousse |
rebase: reduce scope of try catch in restorestate
|
Thu, 15 Oct 2015 12:13:46 -0700 |
Christian Delahousse |
rebase: on abort delete rebase state file no matter what
|
Fri, 16 Oct 2015 15:01:42 -0700 |
Christian Delahousse |
contrib: make editmerge look for merge markers at the beginning of the line
|
Fri, 09 Oct 2015 21:44:54 -0700 |
Tony Tung |
commit: abort when a committemplate is not changed
|
Wed, 14 Oct 2015 16:04:43 -0700 |
Siddharth Agarwal |
localrepo.commit: disallow commit when driver-resolved files exist
|
Wed, 14 Oct 2015 15:01:07 -0700 |
Siddharth Agarwal |
merge.mergestate: add a generator for driver-resolved files
|
Wed, 14 Oct 2015 16:27:10 -0700 |
Siddharth Agarwal |
hook: for python hooks, also return whether an exception was raised
|
Wed, 14 Oct 2015 16:19:47 -0700 |
Siddharth Agarwal |
hook.runhooks: return a dict of result values
|
Wed, 14 Oct 2015 16:13:31 -0700 |
Siddharth Agarwal |
hook: factor out determination of hooks from running them
|
Tue, 10 Mar 2015 13:19:17 +0100 |
Mads Kiilerich |
mq: generate patch names from first line of description
|
Thu, 15 Oct 2015 21:36:47 +0200 |
Mads Kiilerich |
contrib: offer Python 2.7.10
|
Thu, 15 Oct 2015 21:35:49 +0200 |
Mads Kiilerich |
contrib: drop Python < 2.6 from Makefile.python
|
Fri, 16 Oct 2015 11:37:34 +0200 |
Mads Kiilerich |
mergetools.rc: find OSX FileMerge in the new location inside Xcode 4.3
|
Thu, 15 Oct 2015 14:53:32 -0700 |
Gregory Szorc |
exchange: don't print error codes after clone bundle failure
|
Wed, 14 Oct 2015 14:53:15 -0400 |
Augie Fackler |
debian: install bash completion as hg and not mercurial (issue4900)
|
Wed, 14 Oct 2015 12:57:33 -0400 |
Augie Fackler |
merge-tools: allow marking a mergetool as completely disabled
|
Tue, 13 Oct 2015 23:04:53 -0700 |
Sean Farley |
exchange: add oparg to push so that extensions can wrap pushop
|
Thu, 15 Oct 2015 03:15:54 +0100 |
Pierre-Yves David |
destmerge: extract logic based on branch heads in its own function
|
Thu, 15 Oct 2015 03:13:14 +0100 |
Pierre-Yves David |
destmerge: extract logic based on bookmark into its own function
|
Thu, 15 Oct 2015 03:00:09 +0100 |
Pierre-Yves David |
destupdate: have a generic and extensible way to run each step
|
Thu, 15 Oct 2015 02:33:09 +0100 |
Pierre-Yves David |
destupdate: extract logic based on branch in its own function
|
Thu, 15 Oct 2015 02:27:30 +0100 |
Pierre-Yves David |
destupdate: extract logic based on bookmarks in its own function
|
Thu, 15 Oct 2015 02:15:43 +0100 |
Pierre-Yves David |
destupdate: extract logic based on obsolescence marker in its own function
|
Thu, 15 Oct 2015 02:12:55 +0100 |
Pierre-Yves David |
destupdate: move obsolete handling first
|
Thu, 15 Oct 2015 02:12:15 +0100 |
Pierre-Yves David |
destupdate: indent bookmark and branch logic
|
Thu, 15 Oct 2015 14:10:57 +0100 |
Pierre-Yves David |
destupdate: extract validation logic
|
Thu, 15 Oct 2015 01:56:03 +0100 |
Pierre-Yves David |
rebase: rename and test '_destrebase'
|
Thu, 15 Oct 2015 01:51:53 +0100 |
Pierre-Yves David |
rebase: directly use '_destrebase'
|
Thu, 15 Oct 2015 01:50:31 +0100 |
Pierre-Yves David |
rebase: extra default destination in its own function
|
Thu, 15 Oct 2015 01:47:28 +0100 |
Pierre-Yves David |
revset: rename and test '_destmerge'
|
Thu, 15 Oct 2015 01:19:32 +0100 |
Pierre-Yves David |
merge: directly get destination from destutil
|
Thu, 15 Oct 2015 01:11:00 +0100 |
Pierre-Yves David |
destutil: move default merge destination into a function
|
Thu, 15 Oct 2015 01:35:44 +0100 |
Pierre-Yves David |
revset: reintroduce and experimental revset for update destination
|
Wed, 14 Oct 2015 15:11:53 -0400 |
Augie Fackler |
changegroup: move manifest unpacking into its own method
|
Thu, 01 Oct 2015 15:35:10 -0400 |
Augie Fackler |
changegroup: move manifest packing into a separate function
|
Wed, 30 Sep 2015 19:59:12 -0400 |
Augie Fackler |
changegroup: rename manifest linknode closure for clarity
|
Tue, 29 Sep 2015 15:14:03 -0400 |
Augie Fackler |
changegroup: reformat packermap and add comment
|
Wed, 14 Oct 2015 12:05:27 -0400 |
Augie Fackler |
changegroup: document the public surface area of cg?unpackers
|
Wed, 14 Oct 2015 11:58:56 -0400 |
Augie Fackler |
changegroup: mark cg1unpacker.chunklength as private
|
Wed, 14 Oct 2015 11:58:35 -0400 |
Augie Fackler |
changegroup: note why a few methods on cg1unpacker exist
|
Wed, 14 Oct 2015 11:32:33 -0400 |
Augie Fackler |
revlog: rename bundle to cg to reflect its nature as a cg?unpacker
|
Tue, 13 Oct 2015 17:16:10 -0400 |
Augie Fackler |
changegroup: mark _addchangegroupfiles as module-private
|
Tue, 13 Oct 2015 17:14:37 -0400 |
Augie Fackler |
changegroup: delete now-unused addchangegroup method
|
Tue, 13 Oct 2015 17:14:07 -0400 |
Augie Fackler |
localrepo: use cg?unpacker.apply() instead of changegroup.addchangegroup()
|
Tue, 13 Oct 2015 17:12:46 -0400 |
Augie Fackler |
repair: use cg?unpacker.apply() instead of changegroup.addchangegroup()
|
Tue, 13 Oct 2015 17:12:29 -0400 |
Augie Fackler |
exchange: use cg?unpacker.apply() instead of changegroup.addchangegroup()
|
Tue, 13 Oct 2015 17:12:12 -0400 |
Augie Fackler |
commands: use cg?unpacker.apply() instead of changegroup.addchangegroup()
|
Tue, 13 Oct 2015 17:11:52 -0400 |
Augie Fackler |
bundle2: use cg?unpacker.apply() instead of changegroup.addchangegroup()
|
Tue, 13 Oct 2015 17:11:18 -0400 |
Augie Fackler |
shelve: use cg?unpacker.apply() instead of changegroup.addchangegroup()
|
Tue, 13 Oct 2015 17:14:21 -0400 |
Augie Fackler |
histedit: use cg?unpacker.apply() instead of changegroup.addchangegroup()
|
Tue, 13 Oct 2015 16:58:51 -0400 |
Augie Fackler |
changegroup: migrate addchangegroup() to forward to cg?unpacker.apply()
|
Tue, 13 Oct 2015 15:54:05 -0400 |
Augie Fackler |
changegroup: move source check to top of addchangegroup
|
Thu, 15 Oct 2015 09:52:32 -0400 |
Augie Fackler |
error: remove superfluous pass statements
|
Mon, 12 Oct 2015 18:49:23 -0700 |
Siddharth Agarwal |
hook: raise a separate exception for when loading a hook fails
|
Wed, 14 Oct 2015 11:05:53 -0700 |
Gregory Szorc |
clonebundles: advertise clone bundles feature to clients
|
Wed, 14 Oct 2015 10:36:20 -0700 |
Gregory Szorc |
exchange: advertise if a clone bundle was attempted
|
Tue, 13 Oct 2015 14:55:02 -0700 |
Gregory Szorc |
exchange: record that we attempted to fetch a clone bundle
|
Tue, 13 Oct 2015 12:41:32 -0700 |
Gregory Szorc |
exchange: provide hint on how to disable clone bundles
|
Wed, 14 Oct 2015 10:03:26 -0700 |
Gregory Szorc |
exchange: document filterclonebundleentries
|
Wed, 14 Oct 2015 10:58:35 -0700 |
Gregory Szorc |
wireproto: properly parse false boolean args (BC)
|
Thu, 15 Oct 2015 03:29:00 +0100 |
Pierre-Yves David |
bundle2: gracefully skip 'obsmarkers' part if evolution is disabled
|
Thu, 15 Oct 2015 12:45:34 +0100 |
Pierre-Yves David |
obsstore: make the readonly attribute accessible
|
Mon, 05 Oct 2015 04:26:26 -0700 |
Pierre-Yves David |
update: introduce a 'UpdateAbort' exception
|
Mon, 05 Oct 2015 21:42:09 -0700 |
Pierre-Yves David |
update: "deprecate" call to 'merge.update' without a destination
|
Wed, 14 Oct 2015 20:35:06 -0700 |
Christian Delahousse |
shelve: delete shelve statefile on any exception during abort
|
Wed, 14 Oct 2015 18:22:16 -0700 |
Gregory Szorc |
highlight: add option to prevent content-only based fallback
|
Wed, 14 Oct 2015 17:43:44 -0700 |
Gregory Szorc |
highlight: inline checkfctx()
|
Wed, 14 Oct 2015 17:42:07 -0700 |
Gregory Szorc |
highlight: consolidate duplicate code
|
Tue, 13 Oct 2015 14:06:51 -0700 |
Christian Delahousse |
rebase: properly abort when destination is public (issue4896)
|
Wed, 14 Oct 2015 18:03:17 -0500 |
Matt Mackall |
bookmarks: don't deactivate on no-op update (issue4901)
|
Thu, 15 Oct 2015 00:32:20 +0100 |
Pierre-Yves David |
rebase: properly handle chains of markers with missing nodes
|
Wed, 14 Oct 2015 23:42:15 +0100 |
Pierre-Yves David |
rebase: use a direct reference to repo.changelog
|
Wed, 14 Oct 2015 22:21:05 -0400 |
timeless |
mail: drop python 2.5 support
|
Tue, 13 Oct 2015 22:53:08 -0700 |
Sean Farley |
exchange: use pushop.repo instead of repo
|
Tue, 13 Oct 2015 03:20:05 -0700 |
Ryan McElroy |
rebase: factor out nothing to rebase return code
|
Thu, 15 Oct 2015 00:04:58 +0800 |
Anton Shestakov |
gitweb: visually highlight source lines when hovering over line numbers
|
Tue, 13 Oct 2015 14:17:15 -0700 |
Christian Delahousse |
rebase: added comments
|
Wed, 14 Oct 2015 22:45:51 +0800 |
Anton Shestakov |
monoblue: visually highlight source lines when hovering over line numbers
|
Wed, 14 Oct 2015 22:24:50 +0800 |
Anton Shestakov |
monoblue: make the size of line links bigger to cover line numbers better
|
Sat, 26 Sep 2015 18:16:49 +0800 |
Anton Shestakov |
gitweb: don't drop current revision context on graph page
|
Tue, 13 Oct 2015 16:05:30 -0700 |
Sean Farley |
util: also catch IndexError
|
Wed, 14 Oct 2015 12:23:49 +0200 |
Adrian Buehlmann |
exewrapper: add comments about PYTHONHOME
|
Wed, 14 Oct 2015 12:23:04 +0200 |
Adrian Buehlmann |
exewrapper: report name of failed private DLL in error message
|
Wed, 14 Oct 2015 12:22:09 +0200 |
Adrian Buehlmann |
exewrapper: report name of failed DLL in error message
|
Tue, 13 Oct 2015 00:16:25 +0200 |
Mads Kiilerich |
merge: abort on file/directory case folding collisions (issue4892)
|
Tue, 13 Oct 2015 00:16:25 +0200 |
Mads Kiilerich |
tests: test of case-folding merge collisions
|
Wed, 19 Aug 2015 15:40:13 -0500 |
Matt Mackall |
copies: group bothnew with other sets
|
Wed, 19 Aug 2015 15:32:27 -0500 |
Matt Mackall |
copies: rename renamedelete to renamedeleteset for clarity
|
Wed, 19 Aug 2015 15:26:08 -0500 |
Matt Mackall |
copies: move _makegetfctx calls into checkcopies
|
Wed, 19 Aug 2015 15:17:33 -0500 |
Matt Mackall |
copies: factor out setupctx into _makegetfctx
|
Fri, 21 Aug 2015 15:12:58 -0500 |
Matt Mackall |
copies: avoid reference to c1/c2 in makectx
|
Mon, 12 Oct 2015 03:37:09 -0500 |
Matt Mackall |
mq: use cmdutil.revert instead of hg.revert
|
Wed, 30 Sep 2015 21:48:53 -0700 |
Siddharth Agarwal |
debugmergestate: add support for printing out driver-resolved files
|
Wed, 30 Sep 2015 21:47:27 -0700 |
Siddharth Agarwal |
debugmergestate: add support for printing out merge driver
|
Wed, 30 Sep 2015 19:43:51 -0700 |
Siddharth Agarwal |
merge.mergedriver: don't try resolving files marked driver-resolved
|
Mon, 28 Sep 2015 18:34:06 -0700 |
Siddharth Agarwal |
merge.mergestate: add support for persisting driver-resolved files
|
Wed, 30 Sep 2015 21:42:52 -0700 |
Siddharth Agarwal |
merge.mergestate: add support for persisting a custom merge driver
|
Tue, 13 Oct 2015 12:30:39 -0700 |
Gregory Szorc |
exchange: support sorting URLs by client-side preferences
|
Tue, 13 Oct 2015 12:31:19 -0700 |
Gregory Szorc |
exchange: extract bundle specification components into own attributes
|
Tue, 13 Oct 2015 12:29:50 -0700 |
Gregory Szorc |
exchange: support preserving external names when parsing bundle specs
|
Tue, 13 Oct 2015 10:59:41 -0700 |
Gregory Szorc |
clonebundles: filter on SNI requirement
|
Tue, 13 Oct 2015 11:45:30 -0700 |
Gregory Szorc |
clonebundles: filter on bundle specification
|
Tue, 13 Oct 2015 10:41:54 -0700 |
Gregory Szorc |
clonebundle: support bundle2
|
Mon, 05 Oct 2015 21:31:32 -0700 |
Pierre-Yves David |
update: also use 'destupdate' for pull and unbundle
|
Tue, 29 Sep 2015 01:03:26 -0700 |
Pierre-Yves David |
destupdate: also include bookmark related logic
|
Tue, 13 Oct 2015 10:57:54 -0700 |
Gregory Szorc |
exchange: refactor bundle specification parsing
|
Tue, 13 Oct 2015 11:43:21 -0700 |
Gregory Szorc |
exchange: move bundle specification parsing from cmdutil
|
Tue, 24 Mar 2015 00:28:28 +0900 |
Yuya Nishihara |
revset: add optional offset argument to limit() predicate
|
Mon, 12 Oct 2015 17:19:22 +0900 |
Yuya Nishihara |
revset: port limit() to support keyword arguments
|
Mon, 12 Oct 2015 17:14:47 +0900 |
Yuya Nishihara |
revset: eliminate temporary reference to subset in limit() and last()
|
Wed, 14 Oct 2015 02:49:17 +0900 |
FUJIWARA Katsunori |
dirstate: read from pending file under HG_PENDING mode if it exists
|
Wed, 14 Oct 2015 02:49:17 +0900 |
FUJIWARA Katsunori |
dirstate: make writing in-memory changes aware of transaction activity
|
Wed, 14 Oct 2015 02:49:17 +0900 |
FUJIWARA Katsunori |
dirstate: make functions for backup aware of transaction activity
|
Wed, 14 Oct 2015 02:49:17 +0900 |
FUJIWARA Katsunori |
dirstate: move code paths for backup from dirstateguard to dirstate
|
Tue, 13 Oct 2015 12:25:43 -0700 |
FUJIWARA Katsunori |
localrepo: restore dirstate to one before rollbacking if not parent-gone
|
Wed, 14 Oct 2015 02:40:04 +0900 |
FUJIWARA Katsunori |
parsers: make pack_dirstate take now in integer for consistency
|
Tue, 29 Sep 2015 00:18:49 -0700 |
Pierre-Yves David |
destupdate: include the 'check' logic
|
Mon, 05 Oct 2015 03:50:47 -0700 |
Pierre-Yves David |
destupdate: move the check related to the "clean" logic in the function
|
Mon, 12 Oct 2015 19:22:34 +0200 |
Mads Kiilerich |
largefiles: better handling of merge of largefiles that not are available
|
Sun, 11 Oct 2015 22:13:03 -0700 |
Pierre-Yves David |
patchbomb: check that targets exist at the publicurl
|
Mon, 12 Oct 2015 20:13:12 +0200 |
Mads Kiilerich |
windows: read all global config files, not just the first (issue4491) (BC)
|
Fri, 09 Oct 2015 14:48:59 -0700 |
Ryan McElroy |
strip: factor out revset calculation for strip -B
|
Fri, 09 Oct 2015 11:22:01 -0700 |
Gregory Szorc |
clonebundles: support for seeding clones from pre-generated bundles
|
Tue, 29 Sep 2015 16:17:32 -0700 |
Gregory Szorc |
sslutil: expose attribute indicating whether SNI is supported
|
Sun, 11 Oct 2015 23:58:07 -0700 |
Siddharth Agarwal |
resolve: perform all premerges before performing any file merges (BC)
|
Sun, 11 Oct 2015 23:56:44 -0700 |
Siddharth Agarwal |
test-resolve.t: add some tests for .orig file contents
|
Sun, 11 Oct 2015 23:54:40 -0700 |
Siddharth Agarwal |
test-resolve.t: add some output to show order of operations
|
Sun, 11 Oct 2015 21:56:39 -0700 |
Siddharth Agarwal |
merge.mergestate: perform all premerges before any merges (BC)
|
Sun, 11 Oct 2015 20:12:12 -0700 |
Siddharth Agarwal |
merge: introduce a preresolve function
|
Sun, 11 Oct 2015 18:37:54 -0700 |
Siddharth Agarwal |
merge.mergestate._resolve: also return completed status
|
Sun, 11 Oct 2015 18:29:50 -0700 |
Siddharth Agarwal |
merge.mergestate: add a wrapper around resolve
|
Fri, 09 Oct 2015 13:54:52 -0700 |
Siddharth Agarwal |
simplemerge: move conflict warning message to filemerge
|
Sun, 11 Oct 2015 15:04:00 -0700 |
Siddharth Agarwal |
filemerge: clean up some dead code
|
Mon, 12 Oct 2015 14:15:04 -0400 |
Augie Fackler |
run-tests: add b-prefix on two strings to fix python3 support
|
Sun, 11 Oct 2015 20:47:14 -0700 |
Siddharth Agarwal |
filemerge: break overall filemerge into separate premerge and merge steps
|