Fri, 02 May 2014 01:09:14 +0200 |
Mads Kiilerich |
merge: fix stupid indentation left over from previous refactorings
|
Fri, 28 Feb 2014 02:25:58 +0100 |
Mads Kiilerich |
merge: use separate lists for each action type
|
Thu, 08 May 2014 16:54:23 -0700 |
Durham Goode |
merge: add labels parameter from merge.update to filemerge
|
Fri, 09 May 2014 12:01:56 +0200 |
Mads Kiilerich |
merge: separate worker functions for batch remove and batch get
|
Tue, 22 Apr 2014 02:10:25 +0200 |
Mads Kiilerich |
merge: change debug logging - test output changes but no real changes
|
Thu, 15 May 2014 02:14:59 +0200 |
Mads Kiilerich |
merge: move constant assignments a bit and use them more
|
Fri, 02 May 2014 01:09:14 +0200 |
Mads Kiilerich |
merge: change priority / ordering of merge actions
|
Tue, 22 Apr 2014 02:09:24 +0200 |
Mads Kiilerich |
merge: make debug output slightly more helpful by including message for action
|
Sun, 13 May 2012 17:45:08 +0200 |
Mads Kiilerich |
merge: simplify mergestate iter
|
Fri, 18 Apr 2014 22:19:25 -0700 |
Gregory Szorc |
resolve: print message when no unresolved files remain (issue4214)
|
Fri, 18 Apr 2014 19:08:32 -0700 |
Gregory Szorc |
resolve: abort when not applicable (BC)
|
Thu, 08 May 2014 16:48:28 -0700 |
Gregory Szorc |
mergestate: consistently set variables to None
|
Wed, 30 Apr 2014 14:19:01 -0500 |
Matt Mackall |
ancestor: silence multiple ancestor warning outside of merge (issue4234)
stable
|
Mon, 21 Apr 2014 20:24:54 +0200 |
Mads Kiilerich |
merge: improve notes for listing the bids for ambiguous merges
stable
|
Fri, 18 Apr 2014 13:33:20 +0200 |
Mads Kiilerich |
merge: tell the user when we are using bid merge
stable
|
Mon, 21 Apr 2014 20:22:14 +0200 |
Mads Kiilerich |
merge: fix stray character in bid merge message
stable
|
Mon, 21 Apr 2014 19:53:19 +0200 |
Mads Kiilerich |
merge: fix wrong number of arguments for bid merge message
stable
|
Mon, 21 Apr 2014 15:08:39 -0500 |
Matt Mackall |
merge: fix test failures with new merge code on OS X
stable
|
Fri, 28 Feb 2014 02:52:32 +0100 |
Mads Kiilerich |
merge: with merge.preferancestor=*, run an auction with bids from ancestors
|
Mon, 07 Apr 2014 02:12:28 +0200 |
Mads Kiilerich |
merge: let manifestmerge emit 'keep' actions when keeping wd version
|
Sun, 06 Apr 2014 13:39:51 +0200 |
Mads Kiilerich |
merge: pass merge ancestor to calculateupdates as a list
|
Sun, 06 Apr 2014 13:39:51 +0200 |
Mads Kiilerich |
merge: move ancestor selection tweaking from manifestmerge to update function
|
Sun, 13 Apr 2014 19:01:00 +0200 |
Mads Kiilerich |
spelling: fixes from spell checker
|
Sun, 02 Mar 2014 18:52:16 +0100 |
Mads Kiilerich |
merge: keep destination filename as key in filemerge actions
|
Sun, 02 Mar 2014 18:49:36 +0100 |
Mads Kiilerich |
merge: keep destination filename as key in actions for merge with dir rename
|
Fri, 28 Feb 2014 02:38:33 +0100 |
Mads Kiilerich |
merge: include ancestor node in merge actions
|
Tue, 25 Feb 2014 20:30:08 +0100 |
Mads Kiilerich |
merge: use ancestor filename from planning phase instead of filectx ancestor
|
Tue, 01 Apr 2014 15:11:19 -0500 |
Matt Mackall |
merge with stable
|
Tue, 01 Apr 2014 02:46:03 +0900 |
FUJIWARA Katsunori |
i18n: fix "% inside _()" problems
stable
|
Tue, 01 Apr 2014 02:46:03 +0900 |
FUJIWARA Katsunori |
merge: fix lack of "%s" in format string causing TypeError at runtime
stable
|
Fri, 28 Feb 2014 02:26:03 +0100 |
Mads Kiilerich |
merge: mark mergestate as dirty when resolve changes _state
|
Wed, 05 Mar 2014 10:49:43 -0800 |
Pierre-Yves David |
merge: adds documentation to the mergestate class
|
Wed, 05 Mar 2014 10:22:43 -0800 |
Pierre-Yves David |
merge: add blank line between mergestate's method
|
Tue, 25 Feb 2014 20:29:46 +0100 |
Mads Kiilerich |
merge: use the right ancestor when both sides copied the same file
|
Sun, 02 Mar 2014 18:36:02 +0100 |
Mads Kiilerich |
merge: handle create+delete prompts in calculateupdates
|
Fri, 28 Feb 2014 02:26:03 +0100 |
Mads Kiilerich |
merge: handle acceptremove of create+delete early in manifest merge
|
Sat, 01 Mar 2014 21:08:28 -0500 |
Augie Fackler |
merge with stable
|
Sat, 01 Mar 2014 18:09:39 +0100 |
Mads Kiilerich |
merge: audit the right destination file when merging with dir rename
stable 2.9.1
|
Fri, 28 Feb 2014 02:28:12 +0100 |
Olle Lundberg |
merge: fix spelling of length
|
Tue, 25 Feb 2014 18:45:01 -0800 |
Pierre-Yves David |
resolve: use "other" changeset from merge state (issue4163)
stable
|
Tue, 25 Feb 2014 18:54:47 -0800 |
Pierre-Yves David |
merge: add "other" file node in the merge state file
stable
|
Thu, 27 Feb 2014 14:14:57 -0800 |
Pierre-Yves David |
merge: infer the "other" changeset when falling back to v1 format
stable
|
Tue, 25 Feb 2014 18:42:11 -0800 |
Pierre-Yves David |
merge: record the "other" node in merge state
stable
|
Tue, 25 Feb 2014 18:37:06 -0800 |
Pierre-Yves David |
merge: introduce new format for the state file
stable
|
Thu, 27 Feb 2014 12:59:41 -0800 |
Pierre-Yves David |
merge: change the merge state serialisation to use a record based logic
stable
|
Tue, 25 Feb 2014 17:14:49 -0800 |
Pierre-Yves David |
merge: move merge state file path into a constant
stable
|
Mon, 10 Feb 2014 00:43:54 +0100 |
Mads Kiilerich |
merge: don't overwrite file untracked after remove, abort with 'untracked files'
stable
|
Wed, 15 Jan 2014 16:41:18 -0600 |
Sean Farley |
merge: consider successor changesets for a bare update
|
Wed, 06 Nov 2013 17:02:07 -0600 |
Sean Farley |
merge: refactor initialization of variables in update
|
Wed, 06 Nov 2013 10:26:25 -0600 |
Sean Farley |
merge: update comment for future devs
|
Wed, 06 Nov 2013 10:20:18 -0800 |
Siddharth Agarwal |
merge: move forgets to the beginning of the action list
stable
|
Thu, 24 Oct 2013 01:49:56 +0800 |
Mads Kiilerich |
spelling: random spell checker fixes
stable
|
Tue, 01 Oct 2013 17:43:54 -0700 |
Siddharth Agarwal |
merge: exit early during a no-op update (BC)
|
Mon, 23 Sep 2013 20:53:14 -0700 |
Siddharth Agarwal |
merge: standardize error message for dirty subrepo
|
Mon, 23 Sep 2013 20:50:51 -0700 |
Siddharth Agarwal |
merge: standardize error message for dirty working dir
|
Mon, 23 Sep 2013 20:33:02 -0700 |
Siddharth Agarwal |
update: standardize error message for dirty update --check
|
Mon, 23 Sep 2013 20:08:52 -0700 |
Siddharth Agarwal |
update: improve error message for dirty non-linear update with rev
|
Mon, 23 Sep 2013 20:07:30 -0700 |
Siddharth Agarwal |
update: add error message for dirty non-linear update with no rev
|
Mon, 23 Sep 2013 17:43:33 -0700 |
Siddharth Agarwal |
update: improve error message for clean non-linear update
|
Thu, 25 Jul 2013 00:33:28 -0500 |
Matt Mackall |
update: add tracking of interrupted updates (issue3113)
stable
|
Mon, 03 Jun 2013 17:20:37 -0700 |
Bryan O'Sullivan |
merge: add a files method to the mergestate class
|
Wed, 22 May 2013 17:31:43 -0500 |
Matt Mackall |
ui: merge prompt text components into a singe string
|
Wed, 08 May 2013 14:11:01 -0700 |
Siddharth Agarwal |
manifestmerge: local unknown, remote created: don't traverse symlinks
|
Tue, 30 Apr 2013 05:01:32 +0900 |
FUJIWARA Katsunori |
icasefs: rewrite case-folding collision detection (issue3452)
stable
|
Mon, 29 Apr 2013 15:58:15 +0900 |
FUJIWARA Katsunori |
merge: increase safety of parallel updating/removing on icasefs
stable
|
Tue, 16 Apr 2013 15:33:18 +0200 |
Pierre-Yves David |
update: allow dirty update to foreground (successors)
|
Wed, 10 Apr 2013 12:34:42 -0700 |
Siddharth Agarwal |
manifestmerge: handle workdir removed, remote removed with flags
|
Thu, 04 Apr 2013 16:37:37 -0500 |
Matt Mackall |
merge with stable
|
Mon, 18 Mar 2013 16:37:20 -0500 |
Kevin Bullock |
applyupdates: assign variable before we try to use it (issue3855)
stable 2.5.4
|
Sun, 24 Mar 2013 16:56:25 -0700 |
Siddharth Agarwal |
manifestmerge: drop redundant flags calls
|
Mon, 25 Mar 2013 17:41:06 -0700 |
Siddharth Agarwal |
manifestmerge: use dicthelpers.diff and join
|
Sun, 24 Mar 2013 16:43:25 -0700 |
Siddharth Agarwal |
manifestmerge: rename n to n1 and n2
|
Mon, 18 Mar 2013 16:37:20 -0500 |
Kevin Bullock |
applyupdates: assign variable before we try to use it (issue3855)
|
Fri, 15 Mar 2013 11:23:29 -0700 |
Durham Goode |
rebase: fix --collapse when a file was added then removed
|
Sun, 10 Feb 2013 16:55:01 +0000 |
Siddharth Agarwal |
manifestmerge: fix order in which manifests are fetched
|
Sun, 10 Feb 2013 12:16:46 +0000 |
Siddharth Agarwal |
merge: run _forgetremoved after manifestmerge
|
Sat, 09 Feb 2013 15:51:32 -0800 |
Bryan O'Sullivan |
merge: don't fiddle with name lookups or i18n in hot loops
|
Sat, 09 Feb 2013 15:51:32 -0800 |
Bryan O'Sullivan |
merge: apply non-interactive working dir updates in parallel
|
Sat, 09 Feb 2013 15:22:09 -0800 |
Bryan O'Sullivan |
merge: report non-interactive progress in chunks
|
Sat, 09 Feb 2013 15:22:08 -0800 |
Bryan O'Sullivan |
merge: handle subrepo merges and .hgsubstate specially
|
Sat, 09 Feb 2013 15:21:58 -0800 |
Bryan O'Sullivan |
merge: split out mostly-non-interactive working dir updates
|
Sat, 09 Feb 2013 21:24:36 +0000 |
Bryan O'Sullivan |
merge: don't call copies.mergecopies unless we need to
|
Sat, 09 Feb 2013 21:24:24 +0000 |
Bryan O'Sullivan |
merge: rename p1 to wctx in manifestmerge
|
Sat, 09 Feb 2013 15:36:00 +0000 |
Siddharth Agarwal |
manifestmerge: handle abort on local unknown, remote created files
|
Fri, 08 Feb 2013 15:23:23 +0000 |
Siddharth Agarwal |
manifestmerge: pass in branchmerge and force separately
|
Mon, 04 Feb 2013 02:46:53 +0100 |
Mads Kiilerich |
merge: inline act()
|
Mon, 04 Feb 2013 02:46:53 +0100 |
Mads Kiilerich |
merge: don't indent "local changed %s which remote deleted" prompt
|
Mon, 04 Feb 2013 02:46:38 +0100 |
Mads Kiilerich |
merge: backout manifest sorting and workarounds for cost of it
|
Thu, 24 Jan 2013 23:57:44 +0100 |
Mads Kiilerich |
merge: delay debug messages for merge actions
|
Thu, 24 Jan 2013 23:57:44 +0100 |
Mads Kiilerich |
merge: make all action tuples have the same length - keep args as tuple
|
Thu, 24 Jan 2013 23:57:44 +0100 |
Mads Kiilerich |
merge: delay prompts a bit and show them in (extra) sorted order
|
Wed, 30 Jan 2013 19:29:36 +0100 |
Mads Kiilerich |
merge: fix UnboundLocalError (issue3791)
stable
|
Sun, 20 Jan 2013 17:18:00 -0600 |
Matt Mackall |
merge: only sort manifests in debug mode (issue3769)
stable
|
Wed, 12 Dec 2012 02:38:14 +0100 |
Mads Kiilerich |
subrepos: process subrepos in sorted order
|
Tue, 15 Jan 2013 02:59:12 +0100 |
Mads Kiilerich |
merge: process files in sorted order
|
Tue, 15 Jan 2013 01:05:12 +0100 |
Mads Kiilerich |
merge: remove "case" comments
|
Wed, 09 Jan 2013 02:02:45 +0100 |
Mads Kiilerich |
merge: merge file flags together with file content
|
Thu, 10 Jan 2013 03:40:45 +0100 |
Mads Kiilerich |
merge: remove old pre-audit code checking for absolute paths
|
Thu, 10 Jan 2013 00:45:51 +0100 |
Mads Kiilerich |
merge: drop reference to file contents immediately after write
|
Thu, 10 Jan 2013 00:44:23 +0100 |
Mads Kiilerich |
merge: changing the mode of a file is also an update
|
Tue, 15 Jan 2013 01:05:12 +0100 |
Mads Kiilerich |
merge: use util.unlinkpath for removing moved files
|
Tue, 15 Jan 2013 01:05:12 +0100 |
Mads Kiilerich |
merge: .hgsubstate is special as merge destination, not as merge source
|
Wed, 09 Jan 2013 00:01:33 +0100 |
Mads Kiilerich |
merge: remove redundant unlink after merge
|
Wed, 09 Jan 2013 00:01:33 +0100 |
Mads Kiilerich |
merge: rename list of actions from action to actions
|
Wed, 09 Jan 2013 00:01:33 +0100 |
Mads Kiilerich |
merge: consistently use "x" instead of 'x' for internal action types
|
Wed, 09 Jan 2013 00:01:33 +0100 |
Mads Kiilerich |
merge: consistently use repo.wopener.audit instead of creating a new auditor
|
Fri, 28 Dec 2012 11:55:57 +0100 |
Mads Kiilerich |
util: fold ENOENT check into unlinkpath, controlled by new ignoremissing flag
|
Wed, 26 Dec 2012 14:50:17 -0800 |
Siddharth Agarwal |
copies: separate moves via directory renames from explicit copies
|
Thu, 06 Dec 2012 22:07:44 -0600 |
Kevin Bullock |
merge: fix mistake in moved _checkcollision call from 5881d5b7552f
|
Tue, 04 Dec 2012 12:54:18 -0800 |
David Schleimer |
merge: support calculating merge actions against non-working contexts
|
Tue, 04 Dec 2012 12:54:18 -0800 |
David Schleimer |
merge: refactor action calculation into function
|
Wed, 31 Oct 2012 16:50:22 +0900 |
FUJIWARA Katsunori |
icasefs: make case-folding collision detection as deletion aware (issue3648)
stable
|
Wed, 23 May 2012 20:50:16 +0200 |
Thomas Arendsen Hein |
merge: warn about file deleted in one branch and renamed in other (issue3074)
|
Sun, 13 May 2012 14:04:04 +0200 |
Brodie Rao |
localrepo: add branchtip() method for faster single-branch lookups
|
Thu, 03 May 2012 15:14:58 +0200 |
Patrick Mezard |
rebase: allow collapsing branches in place (issue3111)
|
Sat, 12 May 2012 15:54:54 +0200 |
Brodie Rao |
cleanup: eradicate long lines
|
Sun, 29 Apr 2012 22:25:55 +0200 |
Patrick Mezard |
localrepo: add setparents() to adjust dirstate copies (issue3407)
stable
|
Fri, 27 Apr 2012 13:18:09 -0500 |
Matt Mackall |
merge: check for untracked files more precisely (issue3400)
stable
|
Mon, 23 Apr 2012 14:32:59 +0200 |
Patrick Mezard |
update: fix case-collision with a clean wd and no --clean
stable
|
Mon, 16 Apr 2012 01:11:29 +0900 |
FUJIWARA Katsunori |
icasefs: make case-folding collision detection as rename aware (issue3370)
stable
|