| 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
|
