| 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
|
| Mon, 24 Nov 2014 16:11:22 -0800 |
Martin von Zweigbergk |
merge: indent to prepare for next patch
|
| Mon, 24 Nov 2014 09:50:27 -0800 |
Martin von Zweigbergk |
merge: remove obsolete check for untracked files in 'dm' action
|
| Sun, 23 Nov 2014 23:10:34 -0800 |
Martin von Zweigbergk |
merge: remove dead assignment in applyupdates()
|
| Fri, 21 Nov 2014 13:06:04 -0800 |
Martin von Zweigbergk |
merge: move calculateupdates() before applyupdated()
|
| Mon, 24 Nov 2014 11:28:46 -0800 |
Martin von Zweigbergk |
merge: remove unused variables from _checkcollision()
|
| Thu, 20 Nov 2014 16:39:32 -0800 |
Martin von Zweigbergk |
merge: consistently use single quotes for non-user-facing strings
|
| Wed, 19 Nov 2014 08:50:08 -0800 |
Martin von Zweigbergk |
merge: remove confusing comment about --force
|
| Tue, 18 Nov 2014 16:14:32 -0800 |
Martin von Zweigbergk |
update: remove unnecessary check for unknown files with --check
|
| Fri, 14 Nov 2014 09:33:28 -0800 |
Martin von Zweigbergk |
manifestmerge: use already existing fl2 synonym for m2.flags(f)
|
| Thu, 13 Nov 2014 23:12:15 -0800 |
Martin von Zweigbergk |
merge: drop underscore prefix from _checkunknown()
|
| Tue, 14 Oct 2014 23:18:07 -0700 |
Martin von Zweigbergk |
manifest: transpose pair of pairs from diff()
|
| Tue, 14 Oct 2014 22:48:44 -0700 |
Martin von Zweigbergk |
manifest: for diff(), only iterate over files, not flags
|
| Tue, 14 Oct 2014 17:09:16 -0700 |
Martin von Zweigbergk |
manifest: repurpose flagsdiff() into (node-and-flag)diff()
|
| Mon, 13 Oct 2014 17:12:12 -0500 |
Matt Mackall |
merge: add merge.graft helper
|
| Wed, 08 Oct 2014 14:16:53 -0700 |
Martin von Zweigbergk |
merge: make error message consistent with other commands
|
| Tue, 07 Oct 2014 00:41:58 -0700 |
Pierre-Yves David |
merge.update: use `first` instead of direct indexing
|
| Wed, 01 Oct 2014 03:42:00 +0200 |
Mads Kiilerich |
merge: mute the status message when bid merge kicks in
|
| Wed, 01 Oct 2014 03:41:11 +0200 |
Mads Kiilerich |
merge: use bid merge by default (BC)
|
| Fri, 05 Sep 2014 11:36:20 -0700 |
Durham Goode |
dirstate: wrap setparent calls with begin/endparentchange (issue4353)
|
| Fri, 15 Aug 2014 11:48:05 -0500 |
Matt Mackall |
merge with stable
|
| Fri, 15 Aug 2014 16:20:47 +0200 |
Mads Kiilerich |
cleanup: avoid local vars shadowing imports
|
| Fri, 15 Aug 2014 02:39:01 +0200 |
Mads Kiilerich |
merge: show the scary multiple ancestor hint for merges only, not for updates
stable
|
| 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
|
| Mon, 26 Mar 2012 16:41:54 -0500 |
Matt Mackall |
merge: fix unknown file merge detection for case-folding systems
|
| Thu, 15 Mar 2012 13:11:42 -0500 |
Matt Mackall |
merge with stable
|
| Wed, 14 Mar 2012 14:45:41 -0500 |
Matt Mackall |
merge: accept missing revisions in symlink flag merge (issue3316)
stable
|
| Tue, 13 Mar 2012 16:29:13 -0500 |
Matt Mackall |
merge with stable
|
| Tue, 13 Mar 2012 16:28:08 -0500 |
Matt Mackall |
merge: handle linear update to symlink correctly (issue3316)
stable
|
| Sat, 25 Feb 2012 14:22:58 -0600 |
Matt Mackall |
copies: remove checkdirs options
|
| Thu, 09 Feb 2012 17:54:47 -0600 |
Matt Mackall |
update: just merge unknown file collisions
|
| Thu, 09 Feb 2012 17:04:17 -0600 |
Matt Mackall |
merge: don't use unknown()
|
| Thu, 09 Feb 2012 16:50:19 -0600 |
Matt Mackall |
merge: refactor unknown file conflict checking
|
| Thu, 09 Feb 2012 13:16:20 -0600 |
Matt Mackall |
update: use normal update path with --check (issue2450)
|
| Thu, 26 Jan 2012 20:34:57 -0600 |
Matt Mackall |
merge: defer symlink flag merging to filemerge (issue3200)
stable
|
| Wed, 11 Jan 2012 15:53:42 -0500 |
Jordi Guti?rrez Hermoso |
merge: report all files in _checkunknown
|
| Wed, 04 Jan 2012 15:48:02 -0600 |
Matt Mackall |
copies: split the copies api for "normal" and merge cases (API)
|
| Fri, 16 Dec 2011 19:05:59 -0600 |
Matt Mackall |
merge with stable
|
| Fri, 16 Dec 2011 21:21:27 +0900 |
FUJIWARA Katsunori |
merge: check filename case collision between changesets for branch merging
stable
|
| Thu, 15 Dec 2011 14:37:36 -0600 |
Matt Mackall |
merge with stable
|
| Mon, 12 Dec 2011 17:10:19 +0900 |
FUJIWARA Katsunori |
icasefs: use util.normcase() instead of str.lower() or os.path.normpath()
stable
|
| Fri, 09 Dec 2011 17:34:53 +0100 |
Martin Geisler |
merge: make debug output easier to read
|
| Wed, 07 Dec 2011 11:23:01 -0600 |
Kevin Bullock |
merge: make 'nothing to merge' aborts consistent
|
| Sun, 20 Nov 2011 23:09:32 +0100 |
Mads Kiilerich |
update: don't clobber untracked files with wrong casing
stable
|
| Wed, 17 Aug 2011 14:11:46 +0200 |
Martin Geisler |
merge: use repo.ui directly instead local variable
|
| Thu, 28 Jul 2011 14:36:07 +0900 |
FUJIWARA Katsunori |
i18n: use UTF-8 string to lower filename for case collision check
stable
|
| Fri, 17 Jun 2011 15:21:02 -0500 |
Augie Fackler |
update: check wc.dirty() before setting overwrite=True
|
| Tue, 31 May 2011 11:52:22 -0700 |
Brendan Cully |
Make pull -u behave like pull && update
|
| Thu, 26 May 2011 17:15:35 -0500 |
Matt Mackall |
dirstate: rename forget to drop
|
| Sun, 22 May 2011 11:03:15 +0200 |
Adrian Buehlmann |
applyupdates: audit merged files
|
| Sat, 21 May 2011 23:21:12 +0200 |
Adrian Buehlmann |
applyupdates: audit path on flag changes
|
| Sat, 21 May 2011 02:05:00 +0200 |
Adrian Buehlmann |
applyupdates: audit unlinking of renamed files and directories
|
| Fri, 06 May 2011 15:22:31 +0200 |
Adrian Buehlmann |
rename util.set_flags to setflags
|
| Fri, 06 May 2011 09:54:06 +0200 |
Adrian Buehlmann |
rename path_auditor to pathauditor
|
| Mon, 02 May 2011 10:11:18 +0200 |
Dan Villiom Podlaski Christiansen |
prevent transient leaks of file handle by using new helper functions
|
| Sat, 30 Apr 2011 13:59:14 +0200 |
Alexander Solovyov |
remove unused imports and variables
|
| Wed, 20 Apr 2011 22:43:31 +0200 |
Adrian Buehlmann |
move path_auditor from util to scmutil
|
| Mon, 04 Apr 2011 16:21:59 -0500 |
Matt Mackall |
misc: replace .parents()[0] with p1()
|
| Mon, 04 Apr 2011 15:25:20 -0500 |
Matt Mackall |
merge: add ancestor to the update function
|
| Wed, 23 Mar 2011 09:20:40 -0500 |
Matt Mackall |
merge with stable
|
| Tue, 22 Mar 2011 12:00:38 -0500 |
Matt Mackall |
merge: avoid unlinking destination of merge when case changes (issue2715)
stable
|
| Tue, 08 Mar 2011 01:21:50 +0100 |
Mads Kiilerich |
merge: remove last traces of fastforward merging
|
| Mon, 07 Mar 2011 15:03:10 -0600 |
Matt Mackall |
merge: back out single-parent fast-forward merge
stable
|
| Sat, 05 Mar 2011 16:34:59 -0600 |
Matt Mackall |
merge: drop resolve state for mergers with identical contents (issue2680)
|
| Wed, 16 Feb 2011 08:56:11 -0800 |
Oleg Stepanov |
Do not allow merging with uncommitted changes in a subrepo
stable
|
| Fri, 24 Dec 2010 15:23:01 +0100 |
Dan Villiom Podlaski Christiansen |
explicitly close files
|
| Mon, 31 Jan 2011 13:38:00 +0100 |
Martin Geisler |
merge with stable
|
| Mon, 31 Jan 2011 13:33:41 +0100 |
Erik Zielke |
subrepo: make update -C clean the working directory for svn subrepos
stable
|
| Sun, 02 Jan 2011 19:34:41 +0100 |
Adrian Buehlmann |
rename util.unlink to unlinkpath
|
| Mon, 13 Dec 2010 11:46:31 -0500 |
Greg Ward |
merge: document some internal return values.
|
| Tue, 07 Dec 2010 03:29:21 +0100 |
Mads Kiilerich |
merge: fast-forward merge with descendant
|
| Sun, 10 Oct 2010 09:50:25 -0500 |
Dan Villiom Podlaski Christiansen |
merge: make 'diverging renames' diagnostic a more helpful note.
|
| Mon, 02 Aug 2010 07:15:47 +0300 |
timeless |
merge/progress: marking strings for localization
|
| Sat, 09 Oct 2010 17:02:28 -0500 |
Brodie Rao |
update: use higher level wording for "crosses branches" error
|
| Sat, 09 Oct 2010 14:50:20 -0500 |
Matt Mackall |
merge: handle no file parent in backwards merge (issue2364)
|
| Fri, 24 Sep 2010 12:46:54 -0500 |
Matt Mackall |
backout most of 4f8067c94729
|
| Thu, 23 Sep 2010 00:02:31 -0500 |
Brodie Rao |
cleanup: use x in (a, b) instead of x == a or x == b
|
| Mon, 06 Sep 2010 17:35:49 +0200 |
Peter Arrenbrecht |
merge: delay writing the mergestate during until commit is called
|
| Tue, 14 Sep 2010 12:20:51 +0200 |
Adrian Buehlmann |
combine tests
|
| Wed, 25 Aug 2010 16:23:32 +0200 |
Martin Geisler |
util: remove lexists, Python 2.4 introduced os.path.lexists
|
| Sat, 21 Aug 2010 10:48:49 -0500 |
Matt Mackall |
merge with stable
|
| Sat, 21 Aug 2010 10:41:29 -0500 |
Matt Mackall |
merge: move reverse-merge logic out of filemerge (issue2342)
stable
|
| Wed, 11 Aug 2010 20:16:22 +0800 |
Alecs King |
merge: fix typo in docstring
|
| Fri, 06 Aug 2010 12:59:13 -0500 |
Matt Mackall |
Merge with stable
|
| Thu, 05 Aug 2010 16:17:17 -0500 |
Matt Mackall |
merge: drop reference to file contents after write
stable
|
| Sat, 31 Jul 2010 18:12:50 -0500 |
Matt Mackall |
Merge with stable
|
| Fri, 30 Jul 2010 10:32:24 +0300 |
timeless |
progress: use gerund (updating) for merge progress
stable
|
| Tue, 27 Jul 2010 23:40:46 +0900 |
Nicolas Dumazet |
filectx: use cmp(self, fctx) instead of cmp(self, text)
|
| Wed, 30 Jun 2010 23:56:35 -0500 |
Matt Mackall |
subrepo: correctly handle update -C with modified subrepos (issue2022)
stable
|
| Wed, 30 Jun 2010 17:34:20 -0500 |
Matt Mackall |
update: synchronize permissions in the dirstate (issue1473)
stable
|
| Fri, 18 Jun 2010 08:49:24 +0200 |
Peter Arrenbrecht |
merge: pass constant cset ancestor to fctx.ancestor
stable
|
| Sun, 27 Jun 2010 23:12:05 +0200 |
Martin Geisler |
resolve: do not crash on empty mergestate
stable
|
| Sun, 20 Jun 2010 14:21:56 -0500 |
Matt Mackall |
merge: improve merge with ancestor message
|
| Tue, 04 May 2010 09:57:16 +0200 |
Gilles Moris |
merge: avoid to break the dirstate copy status on moved files
|
| Wed, 05 May 2010 20:21:57 -0500 |
Matt Mackall |
context: only scan unknowns when needed
|
| Tue, 20 Apr 2010 11:17:01 +0200 |
Benoit Boissinot |
dirstate: more explicit name, rename normaldirty() to otherparent()
|
| Wed, 17 Feb 2010 15:43:21 +0100 |
Sune Foldager |
run commit and update hooks after command completion (issue1827)
stable
|
| Sun, 07 Feb 2010 17:44:30 -0600 |
Augie Fackler |
update: make calls to ui.progress()
|
| Mon, 25 Jan 2010 00:05:27 -0600 |
Matt Mackall |
many, many trivial check-code fixups
|
| Tue, 19 Jan 2010 22:20:08 -0600 |
Matt Mackall |
Update license to GPLv2+
stable
|
| Sun, 08 Nov 2009 10:29:52 -0600 |
Matt Mackall |
submerge: properly deal with overwrites
|
| Sat, 07 Nov 2009 16:30:42 -0600 |
Matt Mackall |
subrepo: notice dirty subrepo states when merging
|
| Thu, 05 Nov 2009 10:53:59 +0100 |
Stuart W Marks |
update: allow branch crossing without -c or -C, with no uncommitted changes
|
| Thu, 05 Nov 2009 10:53:36 +0100 |
Stuart W Marks |
update: add comments and test cases for updating across branches
|
| Sat, 19 Sep 2009 01:15:38 +0200 |
Martin Geisler |
do not attempt to translate ui.debug output
|
| Sun, 21 Jun 2009 01:13:19 +0200 |
Simon Heimberg |
ui: extract choice from prompt
|
| Sun, 05 Jul 2009 11:01:01 +0200 |
Alejandro Santos |
compat: can't compare two values of unequal datatypes
|
| Mon, 15 Jun 2009 02:45:38 -0500 |
Matt Mackall |
subrepo: add update/merge logic
|
| Mon, 08 Jun 2009 18:14:44 -0500 |
Matt Mackall |
merge: refactor manifestmerge init to better report effective ancestor
|
| Mon, 08 Jun 2009 18:14:44 -0500 |
Matt Mackall |
merge: simplify file revision comparison logic
|
| Mon, 08 Jun 2009 18:14:44 -0500 |
Matt Mackall |
merge: make locally-added file test more correct
|
| Mon, 08 Jun 2009 18:14:44 -0500 |
Matt Mackall |
merge: drop unused diverge initialization
|
| Mon, 08 Jun 2009 18:14:44 -0500 |
Matt Mackall |
merge: refactor some initialization, drop backwards var
|
| Mon, 08 Jun 2009 18:14:44 -0500 |
Matt Mackall |
merge: combine a copy and move case
|
| Mon, 08 Jun 2009 18:14:44 -0500 |
Matt Mackall |
merge: drop a flag update case
|
| Mon, 08 Jun 2009 18:14:44 -0500 |
Matt Mackall |
merge: combine three identical 'remote is newer' cases
|
| Mon, 08 Jun 2009 18:14:44 -0500 |
Matt Mackall |
merge: drop 'remote deleted' case
|
| Mon, 08 Jun 2009 18:14:44 -0500 |
Matt Mackall |
merge: simplify 'other deleted' case
|
| Mon, 08 Jun 2009 18:14:44 -0500 |
Matt Mackall |
merge: simplify backwards revert test, ready to combine with other cases
|
| Mon, 08 Jun 2009 18:14:44 -0500 |
Matt Mackall |
merge: allow merging going backwards
|
| Mon, 08 Jun 2009 18:14:44 -0500 |
Matt Mackall |
merge: reorder remote creation tests
|
| Mon, 08 Jun 2009 18:14:44 -0500 |
Matt Mackall |
merge: drop recreating case
|
| Mon, 08 Jun 2009 18:14:44 -0500 |
Matt Mackall |
merge: drop an overwrite test
|
| Mon, 08 Jun 2009 18:14:44 -0500 |
Matt Mackall |
merge: simplify a delete case
|
| Mon, 08 Jun 2009 18:14:44 -0500 |
Matt Mackall |
merge: reorder get cases for future simplification
|
| Mon, 08 Jun 2009 18:14:44 -0500 |
Matt Mackall |
merge: fix prompt keep
|
| Mon, 08 Jun 2009 18:14:44 -0500 |
Matt Mackall |
merge: remove a flags case
|
| Mon, 08 Jun 2009 18:14:44 -0500 |
Matt Mackall |
merge: pretend ancestor is local to simplify backwards and overwrite
|
| Mon, 08 Jun 2009 18:14:44 -0500 |
Matt Mackall |
merge: simplify flag merging code slightly
|
| Fri, 22 May 2009 11:42:21 -0500 |
Steve Borho |
merge: give hint as to how to discover uncommitted changes
|
| Tue, 19 May 2009 03:59:58 +0200 |
Benoit Boissinot |
update --clean: do not unlink added files (issue575)
|
| Wed, 13 May 2009 14:08:39 +0200 |
Dirkjan Ochtman |
some modernization cleanups, forward compatibility
|
| Tue, 28 Apr 2009 17:40:46 +0200 |
Simon Heimberg |
separate import lines from mercurial and general python modules
|
| Thu, 30 Apr 2009 10:15:32 -0500 |
Steve Borho |
ui: replace regexp pattern with sequence of choices
|
| Sun, 26 Apr 2009 01:08:54 +0200 |
Martin Geisler |
updated license to be explicit about GPL version 2
|
| Wed, 22 Apr 2009 00:57:28 +0200 |
Martin Geisler |
replace set-like dictionaries with real sets
|
| Wed, 22 Apr 2009 02:01:22 +0200 |
Ronny Pfannschmidt |
switch lock releasing in the core from gc to explicit
|
| Mon, 16 Mar 2009 16:58:41 -0500 |
Matt Mackall |
resolve: move reset to localrepo.commit
|
| Sun, 15 Feb 2009 10:50:48 -0600 |
Matt Mackall |
merge: mark kept local files as readded on linear update (issue539)
|
| Tue, 13 Jan 2009 23:17:19 +0100 |
Patrick Mezard |
Merge with crew-stable
|
| Tue, 13 Jan 2009 22:41:06 +0100 |
Patrick Mezard |
merge: fix execute bit update issue introduced by 89207edf3973
|
| Mon, 12 Jan 2009 09:16:03 +0100 |
Dirkjan Ochtman |
use dict.iteritems() rather than dict.items()
|
| Wed, 07 Jan 2009 02:11:17 +0100 |
Benoit Boissinot |
correctly update dirstate after update+mode change (issue1456)
|
| Wed, 08 Oct 2008 16:22:08 -0500 |
Matt Mackall |
merge: fix bug going backwards for already reverted files (issue1303)
|
| Sun, 31 Aug 2008 16:12:02 +0200 |
Martin Geisler |
i18n: mark strings for translation in Mercurial
|
| Tue, 12 Aug 2008 17:47:08 +0200 |
Dirkjan Ochtman |
merge with crew-stable
|
| Sun, 10 Aug 2008 21:55:06 -0500 |
Matt Mackall |
util: set_flags shouldn't know about repo flag formats
|
| Tue, 01 Jul 2008 17:59:31 +0100 |
Paul Moore |
Sort removes first when applying updates (fixes issues 750 and 912)
|
| Fri, 27 Jun 2008 18:28:45 -0500 |
Matt Mackall |
util: add sort helper
|
| Thu, 26 Jun 2008 14:35:46 -0500 |
Matt Mackall |
use repo[changeid] to get a changectx
|
| Thu, 26 Jun 2008 13:58:24 -0500 |
Matt Mackall |
rename checkfolding to checkcase
|
| Thu, 26 Jun 2008 13:46:29 -0500 |
Matt Mackall |
use repo.changectx(None) to get a workingctx
|
| Sat, 12 Apr 2008 20:51:26 +0200 |
Patrick Mezard |
merge: replace readline() call, missing from posixfile_nt
|
| Fri, 11 Apr 2008 12:52:56 -0500 |
Matt Mackall |
resolve: new command
|
| Fri, 11 Apr 2008 12:04:26 +0200 |
Dirkjan Ochtman |
python-2.6: use sha wrapper from util for new merge code
|
| Thu, 10 Apr 2008 15:02:24 -0500 |
Matt Mackall |
merge: introduce mergestate
|
| Sat, 29 Mar 2008 12:39:47 -0500 |
Matt Mackall |
copies: skip directory rename checks when not merging
|
| Mon, 24 Mar 2008 20:28:13 +0100 |
Thomas Arendsen Hein |
Fix missing space in one of the new update messages.
|
| Mon, 24 Mar 2008 10:01:05 -0500 |
Matt Mackall |
update: better logic and messages for updates
|
| Sat, 22 Mar 2008 13:30:08 -0500 |
Matt Mackall |
update: no -C needed to switch branches without outstanding changes
|
| Sat, 15 Mar 2008 10:02:31 -0500 |
Matt Mackall |
diff: use copy smarts from copies.py
|
| Sat, 15 Mar 2008 10:02:31 -0500 |
Matt Mackall |
copies: move findcopies code to its own module
|
| Sat, 15 Mar 2008 10:02:31 -0500 |
Matt Mackall |
merge: move symmetricdifferences to ancestor.py
|
| Sat, 15 Mar 2008 10:02:31 -0500 |
Matt Mackall |
merge: simplify some helpers
|
| Sat, 15 Mar 2008 10:02:31 -0500 |
Matt Mackall |
merge: more simplifications to checkcopies
|
| Sat, 15 Mar 2008 10:02:31 -0500 |
Matt Mackall |
merge: simplify checkcopies
|
| Sat, 15 Mar 2008 10:02:31 -0500 |
Matt Mackall |
merge: privatize some functions, unnest some others
|
| Fri, 14 Mar 2008 11:01:31 -0500 |
Alexis S. L. Carvalho |
merge: notice uncommited copies (issue1000)
|
| Fri, 14 Mar 2008 09:56:58 -0300 |
Alexis S. L. Carvalho |
merge: require --force when there are deleted files
|
| Wed, 12 Mar 2008 15:44:08 -0700 |
Alexis S. L. Carvalho |
merge: fix handling of deleted files
|
| Thu, 06 Mar 2008 22:23:26 +0100 |
Joel Rosdahl |
Expand import * to allow Pyflakes to find problems
|
| Sun, 03 Feb 2008 19:29:05 -0600 |
Matt Mackall |
filemerge: pull file-merging code into its own module
|
| Mon, 14 Jan 2008 16:28:32 -0600 |
Matt Mackall |
merge: add a bit more sanity to divergent copy checks
|
| Thu, 27 Dec 2007 22:47:44 -0600 |
Matt Mackall |
merge: add flag merging intelligence
|
| Thu, 27 Dec 2007 22:27:48 -0600 |
Matt Mackall |
merge: use util.set_flags
|
| Thu, 27 Dec 2007 22:27:37 -0600 |
Matt Mackall |
merge: simplify merge tests, fix exec flag bug
|
| Wed, 26 Dec 2007 23:03:32 +0100 |
Thomas Arendsen Hein |
merge with crew-stable
|
| Wed, 26 Dec 2007 22:47:16 +0100 |
Thomas Arendsen Hein |
Fix misleading error and prompts during update/merge (issue556)
|
| Sun, 02 Dec 2007 15:15:49 -0600 |
Matt Mackall |
update: default to tipmost branch if default branch doesn't exist
|
| Mon, 05 Nov 2007 18:49:35 -0200 |
Alexis S. L. Carvalho |
Honour the exec bit when we go back in time.
|
| Tue, 09 Oct 2007 17:25:24 -0500 |
Matt Mackall |
Merge with -stable
|
| Mon, 08 Oct 2007 18:47:22 -0500 |
Matt Mackall |
findcopies: fix rename bug
|
| Mon, 08 Oct 2007 18:47:22 -0500 |
Matt Mackall |
findcopies: fix rename bug
|
| Wed, 03 Oct 2007 23:09:36 +0200 |
Patrick Mezard |
merge: provide *_ISLINK environment vars to merge helper
|
| Thu, 04 Oct 2007 19:44:37 -0500 |
Matt Mackall |
merge: add debug diagnostics for findcopies
|
| Thu, 23 Aug 2007 01:48:29 -0300 |
Alexis S. L. Carvalho |
merge: forcefully mark files that we get from the second parent as dirty
|
| Sun, 12 Aug 2007 12:43:52 -0300 |
Alexis S. L. Carvalho |
merge with crew-stable
|
| Fri, 10 Aug 2007 10:46:03 -0700 |
Bryan O'Sullivan |
Make audit_path more stringent.
|
| Sun, 12 Aug 2007 12:15:10 -0300 |
Alexis S. L. Carvalho |
merge: fix a copy detection bug (issue672)
|
| Thu, 02 Aug 2007 13:23:53 -0500 |
Matt Mackall |
Merge with -stable
|
| Thu, 02 Aug 2007 12:29:10 -0500 |
Matt Mackall |
merge: avoid double deletion mentioned in issue636
|
| Wed, 01 Aug 2007 14:03:48 -0500 |
Matt Mackall |
Merge with stable
|
| Wed, 01 Aug 2007 12:33:12 -0500 |
Matt Mackall |
merge: do early copy to deal with issue636
|
| Thu, 26 Jul 2007 12:02:55 -0500 |
Matt Mackall |
Merge with -stable
|
| Thu, 26 Jul 2007 11:19:53 -0500 |
Matt Mackall |
merge: don't forget to update the dirstate for exec bit changes
|
| Sat, 21 Jul 2007 16:02:10 -0500 |
Matt Mackall |
Make repo locks recursive, eliminate all passing of lock/wlock
|
| Sat, 21 Jul 2007 16:02:10 -0500 |
Matt Mackall |
Use try/finally pattern to cleanup locks and transactions
|
| Sat, 21 Jul 2007 16:02:09 -0500 |
Matt Mackall |
dirstate: break update into separate functions
|
| Sun, 15 Jul 2007 14:43:38 -0500 |
Matt Mackall |
merge: fix unnecessary rename merges on linear update (issue631)
|
| Thu, 05 Jul 2007 16:01:07 -0500 |
Matt Mackall |
merge: fix adding untracked files on directory rename (issue612)
|
| Thu, 05 Jul 2007 13:34:18 -0500 |
Matt Mackall |
merge: make test for fast-forward merge stricter (issue619)
|
| Fri, 22 Jun 2007 20:44:40 -0300 |
Alexis S. L. Carvalho |
merge: fix small bug with a failed merge across a rename
|
| Thu, 21 Jun 2007 18:02:03 -0500 |
Matt Mackall |
merge: warn user about divergent renames
|
| Tue, 19 Jun 2007 08:51:34 +0200 |
Thomas Arendsen Hein |
Updated copyright notices and add "and others" to "hg version"
|
| Tue, 19 Jun 2007 08:06:37 +0200 |
Thomas Arendsen Hein |
Cleanup of whitespace, indentation and line continuation.
|
| Mon, 18 Jun 2007 12:38:54 -0700 |
Brendan Cully |
Make fast-forward merges full merges
|
| Tue, 08 May 2007 11:42:48 -0500 |
Matt Mackall |
Merge with stable
|
| Tue, 08 May 2007 02:59:13 -0500 |
Matt Mackall |
merge: fix spurious merges for copies in linear updates
|
| Sun, 06 May 2007 20:27:45 -0700 |
Brendan Cully |
Add fast-forward branch merging
|
| Thu, 03 May 2007 17:27:21 -0500 |
Matt Mackall |
Merge with stable
|
| Thu, 03 May 2007 17:24:43 -0500 |
Matt Mackall |
merge: reorganize some hunks in findcopies
|
| Thu, 03 May 2007 17:24:43 -0500 |
Matt Mackall |
merge: simplify a check in checkcopies
|
| Thu, 03 May 2007 17:24:43 -0500 |
Matt Mackall |
merge: expand and simplify the invalid handling for directory moves
|
| Thu, 03 May 2007 17:24:43 -0500 |
Matt Mackall |
merge: fix a bug detecting directory moves
|
| Thu, 03 May 2007 17:24:43 -0500 |
Matt Mackall |
merge: clarify the findcopies code
|
| Mon, 16 Apr 2007 12:37:30 -0500 |
Matt Mackall |
Merge with stable
|
| Mon, 16 Apr 2007 12:24:52 -0500 |
Matt Mackall |
merge: fix quadratic behavior in find-copies
|
| Thu, 05 Apr 2007 17:09:31 -0500 |
Matt Mackall |
Merge with stable
|
