| Wed, 15 Jan 2014 16:41:18 -0600 |
Sean Farley |
merge: consider successor changesets for a bare update
|
file |
diff |
annotate
|
| Wed, 06 Nov 2013 17:02:07 -0600 |
Sean Farley |
merge: refactor initialization of variables in update
|
file |
diff |
annotate
|
| Wed, 06 Nov 2013 10:26:25 -0600 |
Sean Farley |
merge: update comment for future devs
|
file |
diff |
annotate
|
| Wed, 06 Nov 2013 10:20:18 -0800 |
Siddharth Agarwal |
merge: move forgets to the beginning of the action list
stable
|
file |
diff |
annotate
|
| Thu, 24 Oct 2013 01:49:56 +0800 |
Mads Kiilerich |
spelling: random spell checker fixes
stable
|
file |
diff |
annotate
|
| Tue, 01 Oct 2013 17:43:54 -0700 |
Siddharth Agarwal |
merge: exit early during a no-op update (BC)
|
file |
diff |
annotate
|
| Mon, 23 Sep 2013 20:53:14 -0700 |
Siddharth Agarwal |
merge: standardize error message for dirty subrepo
|
file |
diff |
annotate
|
| Mon, 23 Sep 2013 20:50:51 -0700 |
Siddharth Agarwal |
merge: standardize error message for dirty working dir
|
file |
diff |
annotate
|
| Mon, 23 Sep 2013 20:33:02 -0700 |
Siddharth Agarwal |
update: standardize error message for dirty update --check
|
file |
diff |
annotate
|
| Mon, 23 Sep 2013 20:08:52 -0700 |
Siddharth Agarwal |
update: improve error message for dirty non-linear update with rev
|
file |
diff |
annotate
|
| Mon, 23 Sep 2013 20:07:30 -0700 |
Siddharth Agarwal |
update: add error message for dirty non-linear update with no rev
|
file |
diff |
annotate
|
| Mon, 23 Sep 2013 17:43:33 -0700 |
Siddharth Agarwal |
update: improve error message for clean non-linear update
|
file |
diff |
annotate
|
| Thu, 25 Jul 2013 00:33:28 -0500 |
Matt Mackall |
update: add tracking of interrupted updates (issue3113)
stable
|
file |
diff |
annotate
|
| Mon, 03 Jun 2013 17:20:37 -0700 |
Bryan O'Sullivan |
merge: add a files method to the mergestate class
|
file |
diff |
annotate
|
| Wed, 22 May 2013 17:31:43 -0500 |
Matt Mackall |
ui: merge prompt text components into a singe string
|
file |
diff |
annotate
|
| Wed, 08 May 2013 14:11:01 -0700 |
Siddharth Agarwal |
manifestmerge: local unknown, remote created: don't traverse symlinks
|
file |
diff |
annotate
|
| Tue, 30 Apr 2013 05:01:32 +0900 |
FUJIWARA Katsunori |
icasefs: rewrite case-folding collision detection (issue3452)
stable
|
file |
diff |
annotate
|
| Mon, 29 Apr 2013 15:58:15 +0900 |
FUJIWARA Katsunori |
merge: increase safety of parallel updating/removing on icasefs
stable
|
file |
diff |
annotate
|
| Tue, 16 Apr 2013 15:33:18 +0200 |
Pierre-Yves David |
update: allow dirty update to foreground (successors)
|
file |
diff |
annotate
|
| Wed, 10 Apr 2013 12:34:42 -0700 |
Siddharth Agarwal |
manifestmerge: handle workdir removed, remote removed with flags
|
file |
diff |
annotate
|
| Thu, 04 Apr 2013 16:37:37 -0500 |
Matt Mackall |
merge with stable
|
file |
diff |
annotate
|
| Mon, 18 Mar 2013 16:37:20 -0500 |
Kevin Bullock |
applyupdates: assign variable before we try to use it (issue3855)
stable 2.5.4
|
file |
diff |
annotate
|
| Sun, 24 Mar 2013 16:56:25 -0700 |
Siddharth Agarwal |
manifestmerge: drop redundant flags calls
|
file |
diff |
annotate
|
| Mon, 25 Mar 2013 17:41:06 -0700 |
Siddharth Agarwal |
manifestmerge: use dicthelpers.diff and join
|
file |
diff |
annotate
|
| Sun, 24 Mar 2013 16:43:25 -0700 |
Siddharth Agarwal |
manifestmerge: rename n to n1 and n2
|
file |
diff |
annotate
|
| Mon, 18 Mar 2013 16:37:20 -0500 |
Kevin Bullock |
applyupdates: assign variable before we try to use it (issue3855)
|
file |
diff |
annotate
|
| Fri, 15 Mar 2013 11:23:29 -0700 |
Durham Goode |
rebase: fix --collapse when a file was added then removed
|
file |
diff |
annotate
|
| Sun, 10 Feb 2013 16:55:01 +0000 |
Siddharth Agarwal |
manifestmerge: fix order in which manifests are fetched
|
file |
diff |
annotate
|
| Sun, 10 Feb 2013 12:16:46 +0000 |
Siddharth Agarwal |
merge: run _forgetremoved after manifestmerge
|
file |
diff |
annotate
|
| Sat, 09 Feb 2013 15:51:32 -0800 |
Bryan O'Sullivan |
merge: don't fiddle with name lookups or i18n in hot loops
|
file |
diff |
annotate
|
| Sat, 09 Feb 2013 15:51:32 -0800 |
Bryan O'Sullivan |
merge: apply non-interactive working dir updates in parallel
|
file |
diff |
annotate
|
| Sat, 09 Feb 2013 15:22:09 -0800 |
Bryan O'Sullivan |
merge: report non-interactive progress in chunks
|
file |
diff |
annotate
|
| Sat, 09 Feb 2013 15:22:08 -0800 |
Bryan O'Sullivan |
merge: handle subrepo merges and .hgsubstate specially
|
file |
diff |
annotate
|
| Sat, 09 Feb 2013 15:21:58 -0800 |
Bryan O'Sullivan |
merge: split out mostly-non-interactive working dir updates
|
file |
diff |
annotate
|
| Sat, 09 Feb 2013 21:24:36 +0000 |
Bryan O'Sullivan |
merge: don't call copies.mergecopies unless we need to
|
file |
diff |
annotate
|
| Sat, 09 Feb 2013 21:24:24 +0000 |
Bryan O'Sullivan |
merge: rename p1 to wctx in manifestmerge
|
file |
diff |
annotate
|
| Sat, 09 Feb 2013 15:36:00 +0000 |
Siddharth Agarwal |
manifestmerge: handle abort on local unknown, remote created files
|
file |
diff |
annotate
|
| Fri, 08 Feb 2013 15:23:23 +0000 |
Siddharth Agarwal |
manifestmerge: pass in branchmerge and force separately
|
file |
diff |
annotate
|
| Mon, 04 Feb 2013 02:46:53 +0100 |
Mads Kiilerich |
merge: inline act()
|
file |
diff |
annotate
|
| Mon, 04 Feb 2013 02:46:53 +0100 |
Mads Kiilerich |
merge: don't indent "local changed %s which remote deleted" prompt
|
file |
diff |
annotate
|
| Mon, 04 Feb 2013 02:46:38 +0100 |
Mads Kiilerich |
merge: backout manifest sorting and workarounds for cost of it
|
file |
diff |
annotate
|
| Thu, 24 Jan 2013 23:57:44 +0100 |
Mads Kiilerich |
merge: delay debug messages for merge actions
|
file |
diff |
annotate
|
| Thu, 24 Jan 2013 23:57:44 +0100 |
Mads Kiilerich |
merge: make all action tuples have the same length - keep args as tuple
|
file |
diff |
annotate
|
| Thu, 24 Jan 2013 23:57:44 +0100 |
Mads Kiilerich |
merge: delay prompts a bit and show them in (extra) sorted order
|
file |
diff |
annotate
|
| Wed, 30 Jan 2013 19:29:36 +0100 |
Mads Kiilerich |
merge: fix UnboundLocalError (issue3791)
stable
|
file |
diff |
annotate
|
| Sun, 20 Jan 2013 17:18:00 -0600 |
Matt Mackall |
merge: only sort manifests in debug mode (issue3769)
stable
|
file |
diff |
annotate
|
| Wed, 12 Dec 2012 02:38:14 +0100 |
Mads Kiilerich |
subrepos: process subrepos in sorted order
|
file |
diff |
annotate
|
| Tue, 15 Jan 2013 02:59:12 +0100 |
Mads Kiilerich |
merge: process files in sorted order
|
file |
diff |
annotate
|
| Tue, 15 Jan 2013 01:05:12 +0100 |
Mads Kiilerich |
merge: remove "case" comments
|
file |
diff |
annotate
|
| Wed, 09 Jan 2013 02:02:45 +0100 |
Mads Kiilerich |
merge: merge file flags together with file content
|
file |
diff |
annotate
|
| Thu, 10 Jan 2013 03:40:45 +0100 |
Mads Kiilerich |
merge: remove old pre-audit code checking for absolute paths
|
file |
diff |
annotate
|
| Thu, 10 Jan 2013 00:45:51 +0100 |
Mads Kiilerich |
merge: drop reference to file contents immediately after write
|
file |
diff |
annotate
|
| Thu, 10 Jan 2013 00:44:23 +0100 |
Mads Kiilerich |
merge: changing the mode of a file is also an update
|
file |
diff |
annotate
|
| Tue, 15 Jan 2013 01:05:12 +0100 |
Mads Kiilerich |
merge: use util.unlinkpath for removing moved files
|
file |
diff |
annotate
|
| Tue, 15 Jan 2013 01:05:12 +0100 |
Mads Kiilerich |
merge: .hgsubstate is special as merge destination, not as merge source
|
file |
diff |
annotate
|
| Wed, 09 Jan 2013 00:01:33 +0100 |
Mads Kiilerich |
merge: remove redundant unlink after merge
|
file |
diff |
annotate
|
| Wed, 09 Jan 2013 00:01:33 +0100 |
Mads Kiilerich |
merge: rename list of actions from action to actions
|
file |
diff |
annotate
|
| Wed, 09 Jan 2013 00:01:33 +0100 |
Mads Kiilerich |
merge: consistently use "x" instead of 'x' for internal action types
|
file |
diff |
annotate
|
| Wed, 09 Jan 2013 00:01:33 +0100 |
Mads Kiilerich |
merge: consistently use repo.wopener.audit instead of creating a new auditor
|
file |
diff |
annotate
|
| Fri, 28 Dec 2012 11:55:57 +0100 |
Mads Kiilerich |
util: fold ENOENT check into unlinkpath, controlled by new ignoremissing flag
|
file |
diff |
annotate
|