Mercurial > hg

log mercurial/merge.py @ 51811:673b07a1db08 default tip

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | (0) -480 tip
age author description
Tue, 23 Jul 2024 19:20:22 -0400 Matt Harbison typing: induce pytype to use the standard `attr` instead of the vendored copy
Thu, 18 Jul 2024 12:36:12 +0200 Raphaël Gomès black: format the codebase with 23.3.0
Tue, 23 Jul 2024 10:02:46 +0200 Raphaël Gomès Backout accidental publication of a large range of revisions
Thu, 18 Jul 2024 12:36:12 +0200 Raphaël Gomès black: format the codebase with 23.3.0
Thu, 02 Mar 2023 14:44:43 +0100 Pierre-Yves David branch: pass current transaction when writing branch in merge
Wed, 25 Jan 2023 19:12:31 +0100 Pierre-Yves David dirstate: rename parentchange to changing_parents
Wed, 25 Jan 2023 18:46:20 +0100 Pierre-Yves David dirstate: pass the repo to the `changeparent` method
Thu, 12 Jan 2023 13:14:00 +0000 Arseniy Alekseyev merge: add mergeresult.mapaction to improve speed
Wed, 04 Jan 2023 19:30:47 +0000 Arseniy Alekseyev merge: avoid dereferencing repo fields repeatedly
Fri, 06 Jan 2023 18:09:19 +0000 Arseniy Alekseyev merge: skip syntactic path checks in [_checkunknownfile]
Wed, 04 Jan 2023 17:14:33 +0000 Arseniy Alekseyev merge: cache the fs checks made during [_checkunknownfiles]
Wed, 04 Jan 2023 19:13:41 +0000 Arseniy Alekseyev merge: don't pay for pathconflicts if there are none
Fri, 06 Jan 2023 16:01:31 +0000 Arseniy Alekseyev debug: add a config to abort update early
Thu, 16 Jun 2022 15:20:48 +0200 Raphaël Gomès branching: merge stable into default
Tue, 14 Jun 2022 11:26:18 +0200 Pierre-Yves David purge: prevent a silly crash with --confirm --files stable 6.1.4
Tue, 31 May 2022 22:50:01 +0200 Manuel Jacob py3: catch FileNotFoundError instead of checking errno == ENOENT
Mon, 21 Feb 2022 13:08:28 -0700 Gregory Szorc py3: use class X: instead of class X(object):
Mon, 21 Feb 2022 11:11:59 -0700 Gregory Szorc merge: remove pycompat.iteritems()
Thu, 03 Mar 2022 18:28:30 -0800 Gregory Szorc global: bulk replace simple pycompat.iteritems(x) with x.items()
Thu, 03 Mar 2022 17:34:00 +0100 Gregory Szorc py2: remove simple from __future__ statements
Mon, 28 Feb 2022 18:34:23 +0100 Raphaël Gomès merge: remove direct rustmod reference stable 6.1
Tue, 18 Jan 2022 13:22:55 -0800 Martin von Zweigbergk merge: fix documented order of `labels` argument
Thu, 03 Feb 2022 18:14:25 +0100 Pierre-Yves David narrow: add support for merging add and remove outside of the tracked set
Thu, 03 Feb 2022 18:14:11 +0100 Pierre-Yves David narrow: allow merging non-conflicting change outside of the narrow spec
Sat, 29 Jan 2022 06:21:32 +0100 Pierre-Yves David merge-actions: have an attribute for narrow safetiness
Fri, 28 Jan 2022 15:19:58 +0100 Pierre-Yves David merge-actions: add an explicite "no_op" attribute
Fri, 28 Jan 2022 17:08:30 +0100 Pierre-Yves David merge-actions: make merge action a full featured object
Fri, 28 Jan 2022 16:41:45 +0100 Pierre-Yves David merge: stop using merge action for pathconflict option
Fri, 28 Jan 2022 14:25:51 +0100 Pierre-Yves David merge: break up a not-so-one-liner for readability
Fri, 28 Jan 2022 14:25:45 +0100 Pierre-Yves David merge: break up a not-so-one-liner for readability
Fri, 28 Jan 2022 14:25:39 +0100 Pierre-Yves David merge: break up a not-so-one-liner for readability
Fri, 28 Jan 2022 14:25:32 +0100 Pierre-Yves David merge: break up a not-so-one-liner for readability
Fri, 28 Jan 2022 14:25:05 +0100 Pierre-Yves David merge: break up two not-so-one-liner for extra readability
Fri, 28 Jan 2022 14:24:41 +0100 Pierre-Yves David merge: break up a not-so-one-liner for readability
Fri, 28 Jan 2022 14:24:30 +0100 Pierre-Yves David merge: break up a not-so-one-liner for readability
Fri, 28 Jan 2022 14:23:56 +0100 Pierre-Yves David merge: break up a not-so-one-liner for readability
Fri, 28 Jan 2022 14:23:49 +0100 Pierre-Yves David merge: break up a not-so-one-liner for readability
Fri, 28 Jan 2022 14:23:37 +0100 Pierre-Yves David merge: break up a not-so-one-liner for readability
Tue, 18 Jan 2022 13:23:49 -0800 Martin von Zweigbergk update: set custom conflict label for base commit
Fri, 10 Dec 2021 17:20:21 +0100 Pierre-Yves David doc: remove a spurious ^L in some doc
Thu, 02 Dec 2021 22:59:36 -0800 Martin von Zweigbergk mergestate: merge `preresolve()` into `resolve()`
Fri, 26 Nov 2021 11:53:54 +0100 Raphaël Gomès typo: s/unkown/unknown across the codebase
Wed, 17 Nov 2021 10:22:15 +0100 Pierre-Yves David update: filter the ambiguous mtime in update directly
Wed, 17 Nov 2021 02:58:44 +0100 Pierre-Yves David dirstate: add a comment about a racy piece of code during updates
Fri, 19 Nov 2021 15:39:35 -0800 Martin von Zweigbergk errors: use detailed exit code when trying to merge file outside narrowspec
Thu, 21 Oct 2021 17:25:41 +0200 Raphaël Gomès branching: merge stable into default
Mon, 18 Oct 2021 11:23:07 +0200 Simon Sapin dirstate: store mtimes with nanosecond precision in memory
Tue, 19 Oct 2021 16:14:53 -0700 Kyle Lippincott merge-halt: fix issue with merge.on-failure=halt breaking unshelve stable
Thu, 08 Jul 2021 22:08:32 +0200 Pierre-Yves David sparse: adjust the temporary includes within a `parentchange` context
Tue, 01 Jun 2021 15:19:08 -0700 Martin von Zweigbergk merge: make applyupdates() not mutate mresult argument
Mon, 29 Mar 2021 01:52:06 +0200 Joerg Sonnenberger node: replace nullid and friends with nodeconstants class
Thu, 25 Mar 2021 18:02:08 +0100 Raphaël Gomès contributor: change mentions of mpm to olivia
Wed, 10 Mar 2021 13:14:32 +0530 Pulkit Goyal commit: get info from mergestate whether a file was merged or not
Thu, 18 Mar 2021 18:24:59 -0400 Matt Harbison merge with stable
Thu, 11 Mar 2021 18:33:39 -0500 Matt Harbison merge: force an exception message to bytes before printing as a warning stable
Fri, 29 Jan 2021 15:56:08 -0800 Martin von Zweigbergk errors: use StateError more in merge module
Mon, 18 Jan 2021 10:24:11 +0100 Pierre-Yves David purge: also deal with directory with --confirm
Mon, 18 Jan 2021 10:24:03 +0100 Pierre-Yves David purge: add a --confirm option
Mon, 18 May 2020 17:29:53 -0400 Augie Fackler cleanup: use mergestate.unresolvedcount() instead of bool(list(unresolved()))
Fri, 27 Nov 2020 17:03:29 -0500 Augie Fackler formating: upgrade to black 20.8b1
Fri, 27 Nov 2020 16:59:14 -0500 Augie Fackler merge: remove spurious ' and trailing whitespace from triple-quoted string
Mon, 23 Nov 2020 23:08:58 -0800 Martin von Zweigbergk errors: raise StateError on uncommitted changes when merge starts
Mon, 22 Jun 2020 22:47:43 -0700 Martin von Zweigbergk copies: handle more cases where a file got replaced by a copy
Fri, 09 Oct 2020 09:17:47 -0700 Martin von Zweigbergk py3: convert an exception message to bytes
Mon, 14 Sep 2020 23:46:38 +0200 Pierre-Yves David salvaged: track removal-candidates in more cases
Fri, 02 Oct 2020 18:40:39 +0530 Pulkit Goyal merge: check for conflicting actions irrespective of length of bids
Wed, 30 Sep 2020 18:07:21 +0530 Pulkit Goyal merge: if CHANGED_DELETED and KEEP_NEW are actions, choose CHANGED_DELETED
Wed, 30 Sep 2020 15:46:54 +0530 Pulkit Goyal merge: if DELETED_CHANGED and GET are in actions, choose DELETED_CHANGED
Mon, 24 Aug 2020 15:35:34 +0530 Pulkit Goyal merge: store cases when a file is absent post merge in commitinfo
Thu, 03 Sep 2020 13:44:06 +0530 Pulkit Goyal merge: store commitinfo if these is a dc or cd conflict
Mon, 14 Sep 2020 14:40:12 +0530 Pulkit Goyal merge: disable `m2-vs-ma` optimization if new filenode config is true
Mon, 21 Sep 2020 09:57:29 -0700 Martin von Zweigbergk merge: add a higher-level update() for the common `hg update` use case
Mon, 21 Sep 2020 11:12:58 -0700 Martin von Zweigbergk merge: make low-level update() private (API)
Mon, 21 Sep 2020 09:56:48 -0700 Martin von Zweigbergk merge: add a back_out() function to encapsulate update()
Wed, 16 Sep 2020 18:09:32 +0530 Pulkit Goyal mergestate: define NO_OP_ACTION in module scope instead of inside mergeresult
Wed, 09 Sep 2020 16:49:19 +0530 Pulkit Goyal mergestate: introduce a new ACTION_KEEP_NEW
Thu, 17 Sep 2020 22:34:36 -0700 Martin von Zweigbergk mergedriver: delete it
Tue, 15 Sep 2020 16:10:16 -0700 Martin von Zweigbergk merge: use in-memory mergestate when using in-memory context
Thu, 17 Sep 2020 09:23:21 -0700 Martin von Zweigbergk mergestate: make clean() only be about creating a clean mergestate
Thu, 03 Sep 2020 13:25:29 +0530 Pulkit Goyal merge: move initial handling of mergeactions near to later one
Wed, 26 Aug 2020 16:37:23 +0530 Pulkit Goyal merge: update commitinfo from all mergeresults during bid merge
Mon, 24 Aug 2020 17:22:28 +0530 Pulkit Goyal merge: add missing ACTION_KEEP when both remote and ancestor are not present
Mon, 24 Aug 2020 15:20:09 +0530 Pulkit Goyal merge: store ACTION_KEEP_ABSENT when we are keeping the file absent locally
Tue, 01 Sep 2020 17:08:26 +0530 Pulkit Goyal merge: add `ACTION_KEEP_ABSENT` to represent files we want to keep absent
Mon, 14 Sep 2020 13:51:39 +0530 Pulkit Goyal mergeresult: introduce dedicated tuple for no-op actions
Mon, 14 Sep 2020 11:32:24 -0400 Valentin Gatien-Baron fsmonitor: increase the threshold before we recommend it, when using rust
Wed, 26 Aug 2020 17:20:53 +0530 Pulkit Goyal merge: show list of bids for each file in bid-merge in ui.debug()
Wed, 26 Aug 2020 17:24:22 +0530 Pulkit Goyal merge: show number of ancestors in bid merge debug notes
Mon, 10 Aug 2020 15:47:21 +0530 Pulkit Goyal mergestate: replace `addmergedother()` with generic `addcommitinfo()` (API)
Mon, 10 Aug 2020 15:38:45 +0530 Pulkit Goyal merge: introduce `addcommitinfo()` on mergeresult object
Mon, 10 Aug 2020 15:34:27 +0530 Pulkit Goyal merge: use collections.defaultdict() for mergeresult.commitinfo
Thu, 06 Aug 2020 13:51:43 +0530 Pulkit Goyal merge: drop commitinfo argument to applyupdates (API)
Thu, 06 Aug 2020 13:27:38 +0530 Pulkit Goyal merge: remove emptyactions() and use collections.defaultdict(list) instead
Wed, 05 Aug 2020 16:52:51 +0530 Pulkit Goyal merge: pass mergeresult obj in _forgetremoved() (API)
Wed, 05 Aug 2020 16:00:25 +0530 Pulkit Goyal mergeresult: introduce filemap() which yields filename based mapping
Wed, 05 Aug 2020 15:41:23 +0530 Pulkit Goyal mergeresult: add `files()` and use it
Wed, 05 Aug 2020 15:37:26 +0530 Pulkit Goyal mergeresult: introduce getfile() and use it where required
Wed, 05 Aug 2020 14:03:59 +0530 Pulkit Goyal merge: use ACTION_* constants instead of values in _filternarrowactions()
Wed, 05 Aug 2020 13:50:49 +0530 Pulkit Goyal merge: rework iteration over mergeresult object in checkpathconflicts()
Wed, 05 Aug 2020 13:21:06 +0530 Pulkit Goyal applyupdates: simplfy calculation of number of updated files
Mon, 03 Aug 2020 18:08:37 +0530 Pulkit Goyal mergeresult: yield from getactions() instead of buidling a list and returning
Mon, 03 Aug 2020 17:58:18 +0530 Pulkit Goyal mergeresult: implement a len() function and use it
Mon, 03 Aug 2020 17:32:30 +0530 Pulkit Goyal merge: replace use of actions dict with mergeresult object
Mon, 03 Aug 2020 14:54:45 +0530 Pulkit Goyal mergeresult: add sort argument to getactions() method
Mon, 03 Aug 2020 14:19:06 +0530 Pulkit Goyal merge: pass mergeresult obj in merge._prefetchfiles()
Mon, 03 Aug 2020 14:12:13 +0530 Pulkit Goyal merge: pass mergeresult obj instead of actions in applyupdates() (API)
Mon, 03 Aug 2020 13:30:14 +0530 Pulkit Goyal merge: pass mergeresult obj instead of actions in _checkcollision() (API)
Sat, 25 Jul 2020 01:42:41 +0530 Pulkit Goyal mergeresult: make actionmapping a dict of dict instead of dict of lists
Sat, 25 Jul 2020 01:17:35 +0530 Pulkit Goyal merge: unify logic of couple of if-else's in manifestmerge()
Sun, 02 Aug 2020 10:24:28 -0700 Pulkit Goyal merge: use the new action based mapping introduced in mergeresult obj
Fri, 24 Jul 2020 19:48:38 +0530 Pulkit Goyal mergeresult: introduce action -> (filename, data, msg) mapping and related API
Sun, 02 Aug 2020 10:15:55 -0700 Pulkit Goyal mergeresult: rename _actions to _filemapping
Fri, 24 Jul 2020 19:19:47 +0530 Pulkit Goyal sparse: pass mergeresult obj in sparse.filterupdatesactions() (API)
Fri, 24 Jul 2020 19:13:20 +0530 Pulkit Goyal merge: filter actions before calling _resolvetrivial()
Fri, 24 Jul 2020 18:16:29 +0530 Pulkit Goyal merge: introduce mergeresult.updateactions() and use it
Fri, 24 Jul 2020 17:57:23 +0530 Pulkit Goyal merge: pass mergeresult instead of actions in _checkunknownfiles() (API)
Fri, 24 Jul 2020 17:52:33 +0530 Pulkit Goyal merge: pass mergeresult obj instead of actions dict in _resolvetrivial()
Fri, 24 Jul 2020 17:49:13 +0530 Pulkit Goyal merge: pass mergeresult obj instead of actions in _filternarrowactions()
Fri, 24 Jul 2020 17:31:26 +0530 Pulkit Goyal merge: pass mergeresult in checkpassconflicts() instead of actions (API)
Fri, 24 Jul 2020 16:23:55 +0530 Pulkit Goyal merge: add removefile() to mergeresult object
Fri, 24 Jul 2020 16:18:39 +0530 Pulkit Goyal merge: introduce mergeresult.addfile() and use it
Fri, 24 Jul 2020 15:56:11 +0530 Pulkit Goyal merge: make mergeresult constructor initialize empty object
Fri, 24 Jul 2020 15:15:20 +0530 Pulkit Goyal merge: improve documentation of fbid dict used for merge bid
Fri, 24 Jul 2020 14:45:00 +0530 Pulkit Goyal merge: move conversion of file-key dict to action-key dict in mergeresult
Sun, 02 Aug 2020 10:12:21 -0700 Pulkit Goyal merge: introduce hasconflicts() on mergeresult object
Tue, 14 Jul 2020 16:40:28 +0530 Pulkit Goyal merge: remove no longer required ACTION_GET_OTHER_AND_STORE
Tue, 14 Jul 2020 16:31:52 +0530 Pulkit Goyal merge: pass commitinfo to applyupdates() and get it stored in mergestate
Tue, 14 Jul 2020 16:21:08 +0530 Pulkit Goyal merge: introduce 'commitinfo' in mergeresult
Thu, 23 Jul 2020 18:03:14 +0530 Pulkit Goyal merge: return a mergeresult obj from manifestmerge(), calculateupdates() (API)
Tue, 14 Jul 2020 15:42:28 +0530 Pulkit Goyal merge: document return values of manifestmerge() and calculateupdates()
Thu, 09 Jul 2020 19:02:10 +0530 Pulkit Goyal merge: refactor code to advise fsmonitor in separate function
Thu, 09 Jul 2020 14:44:58 +0530 Pulkit Goyal mergestate: rename addpath() -> addpathonflict() to prevent confusion
Mon, 06 Jul 2020 03:43:32 +0200 Joerg Sonnenberger manifest: tigher manifest parsing and flag use
Thu, 09 Jul 2020 18:48:55 -0700 Rodrigo Damazio Bovendorp scmutil: allowing different files to be prefetched per revision
Wed, 24 Jun 2020 23:17:56 -0700 Martin von Zweigbergk merge: don't grab wlock when merging in memory
Fri, 05 Jun 2020 11:10:33 -0700 Martin von Zweigbergk merge: move an inspection of the dirstate from record to calculate phase
Mon, 18 May 2020 14:59:59 -0400 Augie Fackler mergestate: split out merge state handling code from main merge module
Thu, 09 Apr 2020 16:06:03 +0530 Pulkit Goyal mergestate: store about files resolved in favour of other
Fri, 06 Mar 2020 13:27:41 -0500 Augie Fackler cleanup: run pyupgrade on our source tree to clean up varying things
Wed, 26 Feb 2020 10:40:31 -0800 Martin von Zweigbergk merge: introduce a merge() for that use-case
Thu, 13 Feb 2020 17:15:08 -0800 Martin von Zweigbergk mergestate: determine if active without looking for state files on disk
Mon, 17 Feb 2020 20:30:03 -0500 Valentin Gatien-Baron graft: always allow hg graft --base . (issue6248)
Sat, 08 Feb 2020 10:22:47 -0500 Valentin Gatien-Baron purge: add -i flag to delete ignored files instead of untracked files
Wed, 05 Feb 2020 17:12:39 -0500 Augie Fackler merge: use manifestdict.walk() instead of manifestdict.matches()
Wed, 15 Jan 2020 14:47:38 -0800 Martin von Zweigbergk merge: introduce a revert_to() for that use-case
Wed, 15 Jan 2020 15:30:25 -0800 Martin von Zweigbergk merge: introduce a clean_update() for that use-case
Wed, 29 Jan 2020 11:30:16 -0800 Martin von Zweigbergk mergestate: add accessors for local and other nodeid, not just contexts
Tue, 28 Jan 2020 14:53:23 -0800 Martin von Zweigbergk graft: default `base` argument to common case of `ctx.p1()`
Fri, 10 Jan 2020 13:12:24 -0800 Martin von Zweigbergk graft: let caller pass in overlayworkingctx to merge.graft()
Thu, 23 Jan 2020 15:44:30 -0800 Martin von Zweigbergk merge: start using the per-side copy dicts
Wed, 22 Jan 2020 14:35:30 -0800 Martin von Zweigbergk copies: define a type to return from mergecopies()
Wed, 22 Jan 2020 16:45:56 -0800 Martin von Zweigbergk merge: move initialization of copy dicts to one place
Wed, 15 Jan 2020 15:12:50 -0800 Martin von Zweigbergk merge: avoid a negation in the definition of updatedirstate
Fri, 24 Jan 2020 08:32:35 -0800 Martin von Zweigbergk merge: move definition of `partial` closer to where it's used
Wed, 15 Jan 2020 15:08:42 -0800 Martin von Zweigbergk merge: define updatedirstate a little earlier and reuse it
Wed, 15 Jan 2020 15:07:43 -0800 Martin von Zweigbergk merge: don't call update hook when using in-memory context
Fri, 27 Dec 2019 13:47:59 -0800 Martin von Zweigbergk graftcopies: remove `skip` and `repo` arguments
Mon, 06 Jan 2020 15:24:36 -0800 Martin von Zweigbergk copies: replace duplicatecopies() by function that takes contexts
Fri, 27 Dec 2019 13:03:40 -0800 Martin von Zweigbergk graft: extract repo[None] to a variable
Mon, 13 Jan 2020 17:15:14 -0500 Augie Fackler core: migrate uses of hashlib.sha1 to hashutil.sha1
Thu, 05 Dec 2019 09:39:49 -0800 Martin von Zweigbergk graft: never set both parents equal in the dirstate (issue6098)
Thu, 05 Dec 2019 09:34:43 -0800 Martin von Zweigbergk graft: extract `repo['.']` to local variable
Thu, 05 Dec 2019 09:32:47 -0800 Martin von Zweigbergk graft: rename `pctx` argument to `base` since that's what it is
Sun, 01 Dec 2019 18:46:10 -0500 Matt Harbison cleanup: fix docstring formatting
Fri, 15 Nov 2019 15:36:09 -0800 Martin von Zweigbergk dirstate: include explicit matches in match.traversedir calls
Thu, 14 Nov 2019 08:03:26 -0800 Martin von Zweigbergk utils: move finddirs() to pathutil
Tue, 05 Nov 2019 08:42:42 -0800 Martin von Zweigbergk py3: don't use bytes with vars() or __dict__ stable
Tue, 08 Oct 2019 15:06:18 -0700 Martin von Zweigbergk cleanup: join string literals that are already on one line
Mon, 07 Oct 2019 00:04:04 -0400 Gregory Szorc py3: finish porting iteritems() to pycompat and remove source transformer
Sun, 06 Oct 2019 17:59:15 -0400 Gregory Szorc py3: define and use pycompat.itervalues()
Sun, 06 Oct 2019 16:58:55 -0400 Gregory Szorc py3: manually import pycompat.delattr where it is needed
Sun, 06 Oct 2019 09:48:39 -0400 Augie Fackler formatting: byteify all mercurial/ and hgext/ string literals
Sun, 06 Oct 2019 09:45:02 -0400 Augie Fackler formatting: blacken the codebase
Wed, 25 Sep 2019 11:04:08 -0400 Augie Fackler merge: check argument value with if/raise instead of an assert
Wed, 25 Sep 2019 10:53:10 -0400 Augie Fackler merge: replace magic strings with NAMED_CONSTANTS (API)
Mon, 23 Sep 2019 21:29:53 +0900 Yuya Nishihara merge with stable
Fri, 20 Sep 2019 23:31:03 +0700 Anton Shestakov merge: back out changeset a4ca0610c754 (parents order when grafting a merge) stable 5.1.2
Thu, 19 Sep 2019 07:50:24 +0900 Yuya Nishihara merge with stable
Wed, 18 Sep 2019 17:53:10 +0700 Anton Shestakov merge: respect parents order when using `graft` on a merge, this time for real stable
Mon, 09 Sep 2019 17:26:17 -0400 Augie Fackler merge with stable
Mon, 09 Sep 2019 17:32:21 +0200 Pierre-Yves David merge: respect parents order when using `graft` on a merge stable
Wed, 21 Aug 2019 13:14:39 -0700 Martin von Zweigbergk merge: hint about using `hg resolve` for resolving conflicts
Thu, 27 Jun 2019 11:39:35 +0200 Valentin Gatien-Baron update: fix spurious unclean status bug shown by previous commit
Mon, 27 May 2019 16:55:46 -0400 Valentin Gatien-Baron merge: fix race that could cause wrong size in dirstate
Tue, 04 Jun 2019 17:24:35 +0800 Anton Shestakov merge: correct argument name in docstring
Sat, 09 Mar 2019 22:13:06 -0800 Martin von Zweigbergk merge: simplify initialization of "pas"
Sat, 09 Mar 2019 22:11:27 -0800 Martin von Zweigbergk merge: reorder some initialization to make more sense
Sun, 14 Apr 2019 00:46:25 -0700 Martin von Zweigbergk merge: remove workaround for issue5020
Fri, 12 Apr 2019 09:41:08 -0700 Martin von Zweigbergk copies: print list of divergent renames in sorted order
Wed, 03 Apr 2019 11:21:27 -0700 Martin von Zweigbergk cleanup: use set literals where possible
Sat, 30 Mar 2019 13:13:10 -0700 Martin von Zweigbergk merge: make "labels" argument to graft() optional, like it is for update()
Wed, 20 Feb 2019 19:28:51 -0500 Augie Fackler cleanup: use () to wrap long lines instead of \
Mon, 04 Feb 2019 21:19:05 -0800 Martin von Zweigbergk merge: migrate to scmutil.backuppath()
Mon, 04 Feb 2019 21:23:44 -0800 Martin von Zweigbergk merge: don't unnecessarily calculate absolute path
Mon, 04 Feb 2019 21:21:55 -0800 Martin von Zweigbergk merge: don't unnecessarily calculate backup path
Thu, 17 Jan 2019 09:17:12 -0800 Martin von Zweigbergk cleanup: delete lots of unused local variables
Tue, 08 Jan 2019 14:19:51 -0800 Daniel Ploch merge: make local file storage in the .hg/merge directory extensible
Sun, 23 Dec 2018 13:16:25 +0530 Sushil khanchi merge: modify the logical statement
Fri, 21 Dec 2018 09:48:30 -0800 Martin von Zweigbergk merge: extract helper for creating empty "actions" dict
Fri, 21 Sep 2018 19:48:23 -0400 Matt Harbison py3: rename pycompat.getcwd() to encoding.getcwd() (API)
Tue, 04 Sep 2018 15:55:23 -0700 Gregory Szorc merge: use vfs methods for I/O
Thu, 06 Sep 2018 18:30:12 -0700 Gregory Szorc merge: move purge logic from extension
Fri, 27 Jul 2018 14:56:10 +0300 Pulkit Goyal merge: do the trivial resolution after updating sparse checkout stable
Wed, 18 Jul 2018 09:49:34 -0700 Gregory Szorc merge: mark file gets as not thread safe (issue5933)
Tue, 29 May 2018 00:26:20 +0200 Boris Feld merge: add a 'keepconflictparent' argument to graft
Thu, 21 Jun 2018 09:32:31 -0700 Martin von Zweigbergk merge with stable
Tue, 19 Jun 2018 22:45:52 +0900 Yuya Nishihara merge: do not fill manifest of committed revision with pseudo node (issue5526) stable
Sun, 17 Jun 2018 22:13:41 -0700 Martin von Zweigbergk progress: hide update(None) in a new complete() method
Fri, 15 Jun 2018 22:37:01 -0700 Martin von Zweigbergk progress: create helper class for incrementing progress
Thu, 17 May 2018 15:25:52 -0700 Martin von Zweigbergk narrow: filter set of files to check for case-folding to core
Thu, 17 May 2018 15:12:48 -0700 Martin von Zweigbergk narrow: filter merge actions in core
Fri, 11 May 2018 00:54:37 -0400 Augie Fackler merge: drop support for using updateresults as tuples (API)
Sat, 14 Apr 2018 18:50:45 -0400 Matt Harbison scmutil: teach the file prefetch hook to handle multiple commits
Thu, 29 Mar 2018 21:29:15 -0700 Martin von Zweigbergk context: avoid using a context object as a changeid
Mon, 05 Mar 2018 00:30:00 -0500 Gregory Szorc merge: deprecate accessing update results by index
Mon, 05 Mar 2018 18:10:36 -0800 Gregory Szorc merge: use constants for actions
Mon, 05 Mar 2018 14:21:57 -0500 Gregory Szorc merge: use constants for merge record state
Mon, 05 Mar 2018 14:15:31 -0500 Gregory Szorc merge: use constants for merge driver state
Mon, 05 Mar 2018 14:09:23 -0500 Gregory Szorc merge: use constants for merge state record types
Mon, 05 Mar 2018 00:02:13 -0500 Gregory Szorc merge: return an attrs class from update() and applyupdates()
Thu, 22 Mar 2018 22:58:31 -0400 Matt Harbison merge: add 'isknown=True' to a dirstate.normalize() in _unknowndirschecker
Thu, 22 Mar 2018 22:56:29 -0400 Matt Harbison merge: pconvert paths in _unknowndirschecker before dirstate-normalizing
Fri, 02 Mar 2018 02:44:49 +0530 Pulkit Goyal py3: slice over bytes to prevent getting ascii values
Wed, 28 Feb 2018 21:44:28 +0530 Pulkit Goyal py3: make sure we write in mergestate in bytes mode
Sun, 18 Feb 2018 14:53:55 -0500 Augie Fackler merge: make a copy of dict.items() before mutating the dict during iteration
Tue, 13 Feb 2018 23:37:58 -0500 Augie Fackler merge: coerce nodes to bytes, not str
Sun, 11 Feb 2018 13:25:56 -0500 Matt Harbison merge: invoke scmutil.fileprefetchhooks() prior to applying updates
Sun, 11 Feb 2018 13:09:16 -0800 Gregory Szorc py3: use bytes() to cast context instances
Tue, 06 Feb 2018 22:55:02 +0900 Yuya Nishihara merge: cut import cycle at merge -> extensions
Tue, 06 Feb 2018 22:36:38 +0900 Yuya Nishihara subrepo: split non-core functions to new module
Wed, 17 Jan 2018 17:07:55 +0100 Boris Feld atomicupdate: add an experimental option to use atomictemp when updating
Wed, 27 Dec 2017 13:53:21 -0600 Phil Cohen merge: raise before running mergedriver if using IMM
Thu, 07 Dec 2017 13:20:47 -0800 Phil Cohen merge: don't check for unknown files in IMM
Fri, 01 Dec 2017 00:07:23 -0800 Phil Cohen merge: skip subrepo state, update hooks, and updating the dirstate in IMM
Fri, 01 Dec 2017 00:07:23 -0800 Phil Cohen merge: remove calls to flushall()
Fri, 24 Nov 2017 12:53:58 -0800 Mark Thomas merge: check created file dirs for path conflicts only once (issue5716) stable 4.4.2
Fri, 24 Nov 2017 12:53:58 -0800 Mark Thomas merge: cache unknown dir checks (issue5716) stable
Tue, 24 Oct 2017 11:14:38 -0700 Siddharth Agarwal merge: add a config option to disable path conflict checking stable
Wed, 04 Oct 2017 23:22:34 +0200 muxator update: mention long options explicitly in description of merge.update() stable
Wed, 18 Oct 2017 22:57:15 +0200 Gregory Szorc fsmonitor: warn when fsmonitor could be used
Sun, 15 Oct 2017 20:36:29 -0700 Phil Cohen context: add workingfilectx.markcopied
Sun, 15 Oct 2017 20:36:29 -0700 Phil Cohen merge: don't use workers in in-memory mode
Fri, 06 Oct 2017 06:48:43 -0700 Ryan McElroy merge: ensure that we always commit the mergestate
Thu, 05 Oct 2017 08:03:57 -0700 Mark Thomas merge: improve comments in mergestate._makerecords
Mon, 02 Oct 2017 14:05:30 -0700 Mark Thomas merge: check for path conflicts when merging (issue5628)
Mon, 02 Oct 2017 14:05:30 -0700 Mark Thomas merge: improve error messages for path conflicts during update
Mon, 02 Oct 2017 14:05:30 -0700 Mark Thomas merge: check for path conflicts when updating (issue5628)
Mon, 02 Oct 2017 14:05:30 -0700 Mark Thomas merge: rename conflicts to fileconflicts in _checkunknownfiles
Mon, 02 Oct 2017 14:05:30 -0700 Mark Thomas merge: add _checkunknowndirs function for detecting path conflicts
Mon, 02 Oct 2017 14:05:30 -0700 Mark Thomas merge: backup conflicting directories when getting files
Mon, 02 Oct 2017 14:05:30 -0700 Mark Thomas merge: add merge action 'pr' to rename files during update
Mon, 02 Oct 2017 14:05:30 -0700 Mark Thomas merge: add merge action 'p' to record path conflicts during update
Mon, 02 Oct 2017 14:05:30 -0700 Mark Thomas merge: add pathconflict merge state
Sun, 08 Oct 2017 21:48:40 +0200 Boris Feld configitems: register 'merge.checkunknown' and 'merge.checkignored'
Fri, 29 Sep 2017 15:48:34 +0000 Alex Gaynor style: never use a space before a colon or comma
Fri, 30 Jun 2017 03:43:13 +0200 Boris Feld configitems: register the 'merge.preferancestor' config
Sat, 30 Sep 2017 15:48:08 +0530 Pulkit Goyal py3: use pycompat.bytestr instead of str
Sat, 30 Sep 2017 15:45:15 +0530 Pulkit Goyal py3: explicitly convert dict.keys() and dict.items() into a list
Thu, 14 Sep 2017 13:14:32 -0700 Phil Cohen merge: allow a custom working context to be passed to update
Tue, 12 Sep 2017 19:27:01 -0700 Phil Cohen merge: move cwd-missing detection to helper functions
Mon, 11 Sep 2017 13:17:43 -0700 Phil Cohen merge: flush any deferred writes just before recordupdates()
Mon, 11 Sep 2017 13:03:27 -0700 Phil Cohen merge: flush any deferred writes before, and after, running any workers
Mon, 11 Sep 2017 13:03:27 -0700 Phil Cohen merge: pass wctx to premerge, filemerge
Thu, 31 Aug 2017 11:28:59 -0700 Phil Cohen merge: move some of the logic in batchget() to workingfilectx
Fri, 14 Jul 2017 19:27:28 +0000 Alex Gaynor merge: removed sorting in casefolding detection, for a slight performance win
Fri, 14 Jul 2017 14:22:40 -0700 Jun Wu codemod: register core configitems using a script
Thu, 06 Jul 2017 16:29:31 -0700 Gregory Szorc sparse: refactor update actions filtering and call from core
Thu, 06 Jul 2017 14:33:18 -0700 Gregory Szorc sparse: move pruning of temporary includes into core
Tue, 01 Dec 2015 09:26:33 -0800 Martin von Zweigbergk mergestate: implement unresolvedcount() in terms of unresolved()
Tue, 01 Dec 2015 09:26:10 -0800 Martin von Zweigbergk mergestate: make unresolved() use iteritems()
Tue, 04 Jul 2017 22:35:52 -0700 Phil Cohen workingfilectx: add exists, lexists
Tue, 27 Jun 2017 01:40:34 +0200 Pierre-Yves David obsutil: move 'foreground' to the new modules
Mon, 26 Jun 2017 17:20:46 +0530 Pulkit Goyal py3: use hex() to convert the hash to bytes
Sun, 25 Jun 2017 22:30:14 -0700 Phil Cohen workingfilectx: add audit() as a wrapper for wvfs.audit()
Sun, 25 Jun 2017 22:30:14 -0700 Phil Cohen workingfilectx: add backgroundclose as a kwarg to write()
Sun, 25 Jun 2017 22:29:09 -0700 Phil Cohen merge: change repo.wvfs.setflags calls to a new wctx[f].setflags function
Sun, 25 Jun 2017 17:00:15 -0700 Phil Cohen merge: convert repo.wwrite() calls to wctx[f].write()
Sun, 25 Jun 2017 16:58:26 -0700 Phil Cohen merge: replace repo.wvfs.unlinkpath() with calls to wctx[f].remove()
Sun, 25 Jun 2017 16:56:49 -0700 Phil Cohen merge: pass wctx to batchremove and batchget
Fri, 16 Jun 2017 01:46:47 +0530 Pulkit Goyal py3: replace dict.iterkeys() with iter(dict)
Sat, 03 Jun 2017 19:01:19 +0900 Yuya Nishihara merge: use scmutil.intrev() to sort ctx objects
Thu, 01 Jun 2017 02:14:26 +0530 Pulkit Goyal py3: convert bool variables to bytes before passing into ui.debug()
Wed, 31 May 2017 23:48:52 +0530 Pulkit Goyal py3: replace None with -1 to sort an integer array
Fri, 12 May 2017 16:33:33 -0700 Martin von Zweigbergk merge: use intersectmatchers() in "m2-vs-ma optimization"
Thu, 18 May 2017 17:11:24 -0400 Augie Fackler merge: migrate to context manager for changing dirstate parents
Thu, 11 May 2017 18:38:43 -0700 Phil Cohen merge: use repo.wvfs.setflags() instead of util.setflags()
Wed, 03 May 2017 10:43:59 -0700 Durham Goode rebase: use matcher to optimize manifestmerge
Sun, 26 Mar 2017 16:55:56 -0700 Jun Wu merge: use ProgrammingError
Sun, 19 Mar 2017 11:42:17 -0700 Durham Goode merge: remove unnecessary matcher checks
Mon, 13 Mar 2017 21:58:43 -0700 Martin von Zweigbergk merge: also allow 'e' action with experimental.updatecheck=noconflict
Sun, 12 Mar 2017 16:41:46 -0700 Mads Kiilerich merge: check current wc branch for 'nothing to merge', not its p1
Wed, 08 Mar 2017 16:53:32 -0800 Pierre-Yves David merge: directly use repo.vfs.join
Wed, 14 Jan 2015 01:15:26 +0100 Mads Kiilerich merge: use repo.wvfs.unlinkpath
Wed, 14 Jan 2015 01:15:26 +0100 Mads Kiilerich vfs: use repo.wvfs.unlinkpath
Tue, 07 Mar 2017 18:38:20 -0800 Durham Goode merge: remove uses of manifest.matches
Mon, 06 Mar 2017 23:21:27 -0800 Martin von Zweigbergk update: for "noconflict" updates, print "conflicting changes" on conflict
Mon, 13 Feb 2017 00:05:55 -0800 Martin von Zweigbergk update: allow setting default update check to "noconflict"
Mon, 13 Feb 2017 12:58:37 -0800 Martin von Zweigbergk update: accept --merge to allow merging across topo branches (issue5125)
Mon, 27 Feb 2017 15:09:19 -0800 Martin von Zweigbergk merge: combine the "merge" cases in docstring table
Mon, 27 Feb 2017 15:07:01 -0800 Martin von Zweigbergk merge: combine "dirty" cases in docstring table
Mon, 27 Feb 2017 15:29:34 -0800 Martin von Zweigbergk merge: clarify non-linear default updates in docstring table
Mon, 27 Feb 2017 15:02:36 -0800 Martin von Zweigbergk merge: combine the two "can't happen" cases in docstring table
Mon, 27 Feb 2017 15:00:13 -0800 Martin von Zweigbergk merge: move "incompatible options" case first in docstring table
Mon, 27 Feb 2017 14:58:53 -0800 Martin von Zweigbergk merge: make "linear" an input in docstring table
Mon, 27 Feb 2017 14:33:17 -0800 Martin von Zweigbergk merge: drop redundant column in docstring table
Mon, 27 Feb 2017 14:27:22 -0800 Martin von Zweigbergk merge: drop obsolete non-linear cases from docstring table
Thu, 09 Feb 2017 09:52:32 -0800 Martin von Zweigbergk destutil: remove duplicate check and leave it to merge.update()
Thu, 09 Feb 2017 09:55:31 -0800 Martin von Zweigbergk update: fix typo/stale comment to match code
Wed, 08 Feb 2017 23:03:33 -0800 Martin von Zweigbergk merge: remove unused handling of default destination in merge.update()
Wed, 08 Feb 2017 14:49:37 -0800 Martin von Zweigbergk update: localize logic around which ancestor to use
Wed, 01 Feb 2017 02:10:30 +0100 Mads Kiilerich merge: more safe detection of criss cross merge conflict between dm and r stable
Tue, 31 Jan 2017 03:25:59 +0100 Mads Kiilerich merge: fix crash on criss cross merge with dir move and delete (issue5020) stable
Mon, 05 Dec 2016 17:40:01 +0100 Gábor Stefanik graft: support grafting changes to new file in renamed directory (issue5436)
Wed, 23 Nov 2016 00:03:11 +0530 Pulkit Goyal py3: use pycompat.getcwd() instead of os.getcwd()
Mon, 21 Nov 2016 21:52:19 -0500 Augie Fackler mergemod: drop support for merge.update without a target
Thu, 10 Nov 2016 02:21:15 -0800 Durham Goode merge: change modified indicator to be 20 bytes
Thu, 10 Nov 2016 02:19:16 -0800 Durham Goode dirstate: change added/modified placeholder hash length to 20 bytes
Mon, 17 Oct 2016 23:16:55 +0200 Mads Kiilerich spelling: fixes of non-dictionary words
Thu, 25 Aug 2016 22:02:26 +0200 Gábor Stefanik update: enable copy tracing for backwards and non-linear updates
Tue, 04 Oct 2016 04:06:48 -0700 Stanislau Hlebik update: warn if cwd was deleted
Wed, 12 Oct 2016 12:22:18 +0200 Mads Kiilerich merge: clarify warning for (not) merging flags without ancestor
Wed, 12 Oct 2016 12:22:18 +0200 Mads Kiilerich merge: only show "cannot merge flags for %s" warning if flags are different
Sun, 02 Oct 2016 17:31:32 +0900 Yuya Nishihara merge: update doc of manifestmerge() per 18c2184c27dc
Sat, 08 Oct 2016 01:25:28 -0700 Simon Farnsworth merge: use labels in subrepo merge
Tue, 30 Aug 2016 09:22:53 -0700 Martin von Zweigbergk util: rename checkcase() to fscasesensitive() (API)
Tue, 23 Aug 2016 17:58:53 -0700 Siddharth Agarwal merge: remove files with extra actions from merge action list
Fri, 12 Aug 2016 05:56:40 -0700 Simon Farnsworth merge: always use other, not remote, in user prompts
Fri, 12 Aug 2016 06:01:42 -0700 Simon Farnsworth merge: use labels in prompts to the user
Thu, 21 Jul 2016 15:55:47 -0700 Kostia Balytskyi update: fix bug when update tries to modify folder symlink stable
Fri, 01 Jul 2016 17:42:55 +0200 Kostia Balytskyi update: teach hg to override untracked dir with a tracked file on update
Fri, 10 Jun 2016 00:12:33 -0400 Augie Fackler cleanup: replace uses of util.(md5|sha1|sha256|sha512) with hashlib.\1
Thu, 26 May 2016 01:57:34 +0900 FUJIWARA Katsunori merge: make messages translatable
Mon, 16 May 2016 21:30:53 +0000 timeless py3: convert to next() function
Wed, 11 May 2016 09:31:47 +0200 Pierre-Yves David devel: officially deprecate update without destination
Sun, 08 May 2016 10:43:41 +0200 Pierre-Yves David devel: use the new 'config' argument for the update develwarn
Sat, 19 Mar 2016 18:37:10 -0700 Simon Farnsworth merge: save merge part labels for later reuse
Fri, 26 Feb 2016 19:13:10 +0000 Simon Farnsworth merge: fix error message
Tue, 23 Feb 2016 10:59:25 -0800 Martin von Zweigbergk merge: use any() instead of for loop when checking for dirty subrepos
Sat, 20 Feb 2016 15:54:09 -0800 Gregory Szorc merge: perform background file closing in batchget
Sat, 20 Feb 2016 15:27:11 -0800 Gregory Szorc merge: indent code in batchget()
Thu, 11 Feb 2016 17:23:10 -0800 Durham Goode checkunknown: audit path before checking if it's a file or link
Wed, 03 Feb 2016 13:12:06 -0800 Siddharth Agarwal rebase: respect checkunknown and checkignored in more cases
Mon, 01 Feb 2016 20:28:32 -0800 Siddharth Agarwal merge: tell _checkunknownfiles about whether this was merge --force
Mon, 01 Feb 2016 20:28:32 -0800 Siddharth Agarwal merge: add missing doc for 'labels' parameter
Mon, 01 Feb 2016 20:28:32 -0800 Siddharth Agarwal merge: move abort/warn checks up to the top level of _checkunknownfiles
Fri, 05 Feb 2016 10:22:14 -0800 Durham Goode merge: add file ancestor linknode to mergestate
Fri, 05 Feb 2016 10:15:28 -0800 Durham Goode merge: add state extras merge state data
Fri, 29 Jan 2016 14:19:29 -0800 Siddharth Agarwal merge: don't try to merge subrepos twice (issue4988) stable
Fri, 15 Jan 2016 13:14:49 -0800 Bryan O'Sullivan with: use context manager in merge update
Tue, 12 Jan 2016 18:38:49 -0800 Siddharth Agarwal merge: split up checks for unknown and ignored files that differ
Tue, 12 Jan 2016 18:17:07 -0800 Siddharth Agarwal merge: determine what untracked conflicts cause warns and aborts separately
Tue, 12 Jan 2016 18:12:35 -0800 Siddharth Agarwal merge: factor out code to get checkunknown config
Sat, 02 Jan 2016 03:11:52 -0800 Siddharth Agarwal merge: add options to warn or ignore on colliding unknown files
Sat, 02 Jan 2016 03:21:01 -0800 Siddharth Agarwal batchget: add support for backing up files
Sat, 02 Jan 2016 03:02:57 -0800 Siddharth Agarwal merge: add a new 'backup' argument to get actions
Sat, 02 Jan 2016 03:02:57 -0800 Siddharth Agarwal _checkunknownfiles: turn 'conflicts' into a set
Sat, 02 Jan 2016 03:02:57 -0800 Siddharth Agarwal checkunknownfiles: make control flow clearer
Sat, 02 Jan 2016 03:02:57 -0800 Siddharth Agarwal _checkunknownfiles: rename 'aborts' to 'conflicts'
Sat, 02 Jan 2016 02:13:56 +0100 Matt Mackall merge with stable
Mon, 28 Dec 2015 22:51:37 -0800 Siddharth Agarwal merge: while checking for unknown files don't follow symlinks (issue5027) stable
Mon, 14 Dec 2015 20:57:21 -0500 Augie Fackler manifestmerge: have manifest do matching before diffing
Mon, 14 Dec 2015 20:47:22 -0500 Augie Fackler merge: rework manifestmerge to use a matcher
Mon, 14 Dec 2015 20:37:41 -0500 Augie Fackler merge: restate calculateupdates in terms of a matcher
Mon, 14 Dec 2015 18:54:03 -0500 Augie Fackler merge: have merge.update use a matcher instead of partial fn
Mon, 07 Dec 2015 20:43:24 -0800 Martin von Zweigbergk merge: refuse update/merge if there are unresolved conflicts (BC)
Thu, 03 Dec 2015 23:01:59 -0500 Andrew Halberstadt merge.graft: add option to keep second parent
Wed, 25 Nov 2015 14:25:33 -0800 Siddharth Agarwal merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Tue, 24 Nov 2015 15:26:51 -0800 Siddharth Agarwal merge.recordupdates: mark 'a' files as added unconditionally
Mon, 30 Nov 2015 10:19:39 -0800 Siddharth Agarwal merge: add a new action type representing files to add/mark as modified
Mon, 30 Nov 2015 10:03:21 -0800 Siddharth Agarwal mergestate: add a cached property accessor for the local context
Mon, 30 Nov 2015 10:05:09 -0800 Siddharth Agarwal mergestate: raise exception if otherctx is accessed but _other isn't set
Mon, 23 Nov 2015 18:03:25 -0800 Siddharth Agarwal mergestate: explicitly forget 'dc' conflicts where the deleted side is picked
Mon, 23 Nov 2015 19:06:15 -0800 Siddharth Agarwal merge.applyupdates: add all actions returned from merge state
Sun, 22 Nov 2015 21:58:28 -0800 Siddharth Agarwal merge.applyupdates: create absentfilectxes for change/delete conflicts
Sun, 22 Nov 2015 21:59:52 -0800 Siddharth Agarwal mergestate: add methods to queue files to remove, add or get
Fri, 20 Nov 2015 16:55:01 -0800 Siddharth Agarwal mergestate: add a way to record pending dirstate actions
Sun, 15 Nov 2015 21:55:46 -0800 Siddharth Agarwal merge.recordupdates: don't require action keys to be present in dict
Fri, 20 Nov 2015 11:26:31 -0800 Siddharth Agarwal merge.applyupdates: extend action queues with ones returned from mergestate
Fri, 20 Nov 2015 16:43:25 -0800 Siddharth Agarwal mergestate: add a method to compute actions to perform on dirstate
Fri, 20 Nov 2015 16:37:39 -0800 Siddharth Agarwal merge.applyupdates: use counters from mergestate
Fri, 20 Nov 2015 16:18:51 -0800 Siddharth Agarwal mergestate: add a function to return the number of unresolved files
Fri, 20 Nov 2015 16:17:54 -0800 Siddharth Agarwal mergestate: add a method to return updated/merged/removed counts
Fri, 20 Nov 2015 16:32:47 -0800 Siddharth Agarwal mergestate._resolve: don't return the action any more
Fri, 20 Nov 2015 16:08:22 -0800 Siddharth Agarwal mergestate._resolve: store return code and action for each file
Sat, 14 Nov 2015 00:07:11 -0800 Siddharth Agarwal mergestate.add: store absentfilectxes as nullhex
Fri, 20 Nov 2015 01:14:15 -0800 Siddharth Agarwal mergestate._resolve: handle change/delete conflicts
Thu, 19 Nov 2015 10:50:02 -0800 Siddharth Agarwal merge.mergestate: compute dirstate action
Wed, 18 Nov 2015 14:22:52 -0800 Siddharth Agarwal filemerge: return whether the file was deleted
Wed, 18 Nov 2015 15:46:45 -0800 Siddharth Agarwal mergestate: allow storing and retrieving change/delete conflicts
Wed, 18 Nov 2015 15:46:45 -0800 Siddharth Agarwal mergestate: handle additional record types specially
Wed, 18 Nov 2015 16:39:30 -0800 Siddharth Agarwal mergestate: move binary format documentation into _readrecordsv2
Tue, 17 Nov 2015 14:23:26 -0800 Siddharth Agarwal mergestate.commit: factor out making the list of records
Tue, 17 Nov 2015 14:04:56 -0800 Siddharth Agarwal mergestate: move _read() call to read constructor
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: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
Sun, 15 Nov 2015 22:45:20 -0800 Siddharth Agarwal merge.applyupdates: don't return early if merge driver's conclude failed
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
Thu, 12 Nov 2015 13:14:03 -0800 Martin von Zweigbergk merge: move messages about possible conflicts a litte earlier
Thu, 12 Nov 2015 14:29:02 -0800 Siddharth Agarwal merge.applyupdates: only attempt to merge files in mergeactions
Wed, 04 Nov 2015 23:44:51 -0800 Siddharth Agarwal merge.mergestate: update docstrings for preresolve and resolve
Fri, 23 Oct 2015 06:06:22 -0400 Augie Fackler merge: improve clarity of table in update docstring stable
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: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 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
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 dirstate: make dirstate.write() callers pass transaction object to it
Wed, 14 Oct 2015 15:01:07 -0700 Siddharth Agarwal merge.mergestate: add a generator for driver-resolved files
Mon, 05 Oct 2015 21:42:09 -0700 Pierre-Yves David update: "deprecate" call to 'merge.update' without a destination
Tue, 13 Oct 2015 00:16:25 +0200 Mads Kiilerich merge: abort on file/directory case folding collisions (issue4892)
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, 29 Sep 2015 01:03:26 -0700 Pierre-Yves David destupdate: also include bookmark related logic
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
Sun, 11 Oct 2015 20:47:14 -0700 Siddharth Agarwal filemerge: break overall filemerge into separate premerge and merge steps
Sun, 11 Oct 2015 12:56:21 -0700 Siddharth Agarwal filemerge: also return whether the merge is complete
Thu, 08 Oct 2015 12:55:45 -0700 Pierre-Yves David error: get Abort from 'error' instead of 'util'
Mon, 28 Sep 2015 22:11:23 -0700 Pierre-Yves David merge: get the default update destination from the function
Mon, 05 Oct 2015 01:47:33 -0700 Pierre-Yves David merge: drop special parent assignment in the obsolete case
Wed, 30 Sep 2015 21:22:31 -0700 Siddharth Agarwal merge.mergestate: factor out code to validate v1/v2 records
Fri, 25 Sep 2015 00:54:20 -0400 timeless merge: fix mergestate comment
Wed, 19 Aug 2015 14:05:42 -0500 Matt Mackall bidmerge: choose shortest list of diverge and rename/delete warnings
Fri, 18 Sep 2015 17:23:10 -0700 Pierre-Yves David update: move default destination into a revset
Wed, 16 Sep 2015 12:36:21 -0700 Siddharth Agarwal merge: move merge step to the end
Sat, 08 Aug 2015 19:41:25 -0700 Gregory Szorc merge: use absolute_import
Thu, 25 Jun 2015 17:54:55 -0500 Matt Mackall merge: make merge.preferancestor type and default consistent
Thu, 25 Jun 2015 17:53:16 -0500 Matt Mackall merge: mark ancient debugging option
Wed, 08 Jul 2015 17:01:09 +0900 FUJIWARA Katsunori merge: remove useless dirstate.normallookup() invocation in applyupdates()
Tue, 23 Jun 2015 22:20:08 -0700 Gregory Szorc global: mass rewrite to use modern exception syntax
Sat, 16 May 2015 14:34:19 -0400 Augie Fackler cleanup: use __builtins__.all instead of util.all
Wed, 29 Apr 2015 15:52:31 -0400 Matt Harbison merge: run update hook after the last wlock release stable
Sun, 05 Apr 2015 11:55:38 -0700 Durham Goode graft: allow creating sibling grafts
Wed, 25 Mar 2015 13:55:35 +0900 FUJIWARA Katsunori subrepo: add bailifchanged to centralize raising Abort if subrepo is dirty
Fri, 30 Jan 2015 04:59:05 +0900 FUJIWARA Katsunori merge: mark .hgsubstate as possibly dirty before submerge for consistency stable
Sun, 11 Jan 2015 01:51:52 +0100 Angel Ezquerra localrepo: remove all external users of localrepo.wopener
Thu, 15 Jan 2015 23:17:12 +0100 Angel Ezquerra localrepo: remove all external users of localrepo.opener
Thu, 18 Dec 2014 09:22:09 -0800 Martin von Zweigbergk merge: move checking of unknown files out of manifestmerge()
Sat, 13 Dec 2014 23:52:22 -0800 Martin von Zweigbergk merge: extract method for checking for conflicting untracked file
Mon, 15 Dec 2014 16:45:19 -0800 Martin von Zweigbergk merge: create 'cm' action for 'get or merge' case
Fri, 12 Dec 2014 23:18:36 -0800 Martin von Zweigbergk merge: don't overwrite untracked file at directory rename target
Tue, 18 Nov 2014 20:29:25 -0800 Martin von Zweigbergk merge: remove constant tuple element from 'aborts'
Wed, 19 Nov 2014 11:51:31 -0800 Martin von Zweigbergk merge: collect checking for unknown files at end of manifestmerge()
Wed, 19 Nov 2014 11:48:30 -0800 Martin von Zweigbergk merge: introduce 'c' action like 'g', but with additional safety
Wed, 19 Nov 2014 11:44:00 -0800 Martin von Zweigbergk merge: structure 'remote created' code to match table
Thu, 11 Dec 2014 22:07:41 -0800 Martin von Zweigbergk merge: make calculateupdates() return file->action dict
Thu, 11 Dec 2014 21:58:49 -0800 Martin von Zweigbergk merge: let _forgetremoved() work on the file->action dict
Thu, 11 Dec 2014 21:06:16 -0800 Martin von Zweigbergk merge: let _resolvetrivial() work on the file->action dict
Thu, 11 Dec 2014 20:56:53 -0800 Martin von Zweigbergk merge: let bid merge work on the file->action dict
Mon, 08 Dec 2014 13:24:10 -0800 Martin von Zweigbergk merge: write manifestmerge() using dictionary with entry per file
Fri, 14 Nov 2014 05:53:04 -0800 Martin von Zweigbergk merge: perform case-collision checking on final set of actions
Thu, 11 Dec 2014 21:21:21 -0800 Martin von Zweigbergk merge: move cd/dc prompts after largefiles prompts
Wed, 03 Dec 2014 13:50:28 -0800 Martin von Zweigbergk merge: extract _resolvetrivial() function
Tue, 09 Dec 2014 16:49:55 -0800 Martin von Zweigbergk merge: don't treat 'diverge' and 'renamedelete' like actions
Tue, 09 Dec 2014 14:18:31 -0800 Martin von Zweigbergk merge: move dr/rd warning messages out of applyupdates()
Fri, 05 Dec 2014 16:13:26 -0800 Martin von Zweigbergk merge: don't report progress for dr/rd actions
Wed, 03 Dec 2014 14:03:20 -0800 Martin von Zweigbergk merge: make 'keep' message more descriptive
Fri, 05 Dec 2014 12:10:56 -0600 Matt Mackall merge with stable
Wed, 03 Dec 2014 11:02:52 -0800 Martin von Zweigbergk merge: don't overwrite conflicting file in locally renamed directory
Wed, 03 Dec 2014 10:56:07 -0800 Martin von Zweigbergk merge: don't ignore conflicting file in remote renamed directory
Sun, 23 Nov 2014 15:08:50 -0800 Martin von Zweigbergk merge: duplicate 'if f in copied' into each branch
Sun, 23 Nov 2014 14:09:10 -0800 Martin von Zweigbergk merge: branch code into {n1 and n2, n1, n2} top-level cases
Sun, 16 Nov 2014 23:41:44 -0800 Martin von Zweigbergk update: don't overwrite untracked ignored files on update stable
Wed, 26 Nov 2014 10:25:27 -0800 Martin von Zweigbergk merge: display modify/delete conflict prompts in sorted order
Mon, 01 Dec 2014 19:34:11 -0600 Matt Mackall merge with stable
Mon, 01 Dec 2014 02:30:21 +0100 Mads Kiilerich merge: before cd/dc prompt, check that changed side really changed stable 3.2.2
Wed, 26 Nov 2014 15:37:01 -0800 Pierre-Yves David manifest: document the extra letter in working copy manifest node
Sun, 30 Nov 2014 19:26:53 +0100 Mads Kiilerich merge: 0 is a valid ancestor different from None
Mon, 24 Nov 2014 16:17:02 -0800 Martin von Zweigbergk merge: use None as filename for base in 'both created' conflicts
Mon, 24 Nov 2014 16:42:36 -0800 Martin von Zweigbergk merge: break out "both renamed a -> b" case
Mon, 24 Nov 2014 16:16:34 -0800 Martin von Zweigbergk merge: separate out "both created" cases
less more | (0) -480 tip