| 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
|
| Wed, 26 Dec 2012 14:50:17 -0800 |
Siddharth Agarwal |
copies: separate moves via directory renames from explicit copies
|
file |
diff |
annotate
|
| Thu, 06 Dec 2012 22:07:44 -0600 |
Kevin Bullock |
merge: fix mistake in moved _checkcollision call from 5881d5b7552f
|
file |
diff |
annotate
|
| Tue, 04 Dec 2012 12:54:18 -0800 |
David Schleimer |
merge: support calculating merge actions against non-working contexts
|
file |
diff |
annotate
|
| Tue, 04 Dec 2012 12:54:18 -0800 |
David Schleimer |
merge: refactor action calculation into function
|
file |
diff |
annotate
|
| Wed, 31 Oct 2012 16:50:22 +0900 |
FUJIWARA Katsunori |
icasefs: make case-folding collision detection as deletion aware (issue3648)
stable
|
file |
diff |
annotate
|
| Wed, 23 May 2012 20:50:16 +0200 |
Thomas Arendsen Hein |
merge: warn about file deleted in one branch and renamed in other (issue3074)
|
file |
diff |
annotate
|
| Sun, 13 May 2012 14:04:04 +0200 |
Brodie Rao |
localrepo: add branchtip() method for faster single-branch lookups
|
file |
diff |
annotate
|
| Thu, 03 May 2012 15:14:58 +0200 |
Patrick Mezard |
rebase: allow collapsing branches in place (issue3111)
|
file |
diff |
annotate
|
| Sat, 12 May 2012 15:54:54 +0200 |
Brodie Rao |
cleanup: eradicate long lines
|
file |
diff |
annotate
|
| Sun, 29 Apr 2012 22:25:55 +0200 |
Patrick Mezard |
localrepo: add setparents() to adjust dirstate copies (issue3407)
stable
|
file |
diff |
annotate
|
| Fri, 27 Apr 2012 13:18:09 -0500 |
Matt Mackall |
merge: check for untracked files more precisely (issue3400)
stable
|
file |
diff |
annotate
|
| Mon, 23 Apr 2012 14:32:59 +0200 |
Patrick Mezard |
update: fix case-collision with a clean wd and no --clean
stable
|
file |
diff |
annotate
|
| Mon, 16 Apr 2012 01:11:29 +0900 |
FUJIWARA Katsunori |
icasefs: make case-folding collision detection as rename aware (issue3370)
stable
|
file |
diff |
annotate
|
| Mon, 26 Mar 2012 16:41:54 -0500 |
Matt Mackall |
merge: fix unknown file merge detection for case-folding systems
|
file |
diff |
annotate
|
| Thu, 15 Mar 2012 13:11:42 -0500 |
Matt Mackall |
merge with stable
|
file |
diff |
annotate
|
| Wed, 14 Mar 2012 14:45:41 -0500 |
Matt Mackall |
merge: accept missing revisions in symlink flag merge (issue3316)
stable
|
file |
diff |
annotate
|
| Tue, 13 Mar 2012 16:29:13 -0500 |
Matt Mackall |
merge with stable
|
file |
diff |
annotate
|
| Tue, 13 Mar 2012 16:28:08 -0500 |
Matt Mackall |
merge: handle linear update to symlink correctly (issue3316)
stable
|
file |
diff |
annotate
|
| Sat, 25 Feb 2012 14:22:58 -0600 |
Matt Mackall |
copies: remove checkdirs options
|
file |
diff |
annotate
|
| Thu, 09 Feb 2012 17:54:47 -0600 |
Matt Mackall |
update: just merge unknown file collisions
|
file |
diff |
annotate
|
| Thu, 09 Feb 2012 17:04:17 -0600 |
Matt Mackall |
merge: don't use unknown()
|
file |
diff |
annotate
|
| Thu, 09 Feb 2012 16:50:19 -0600 |
Matt Mackall |
merge: refactor unknown file conflict checking
|
file |
diff |
annotate
|
| Thu, 09 Feb 2012 13:16:20 -0600 |
Matt Mackall |
update: use normal update path with --check (issue2450)
|
file |
diff |
annotate
|
| Thu, 26 Jan 2012 20:34:57 -0600 |
Matt Mackall |
merge: defer symlink flag merging to filemerge (issue3200)
stable
|
file |
diff |
annotate
|
| Wed, 11 Jan 2012 15:53:42 -0500 |
Jordi Gutiérrez Hermoso |
merge: report all files in _checkunknown
|
file |
diff |
annotate
|
| Wed, 04 Jan 2012 15:48:02 -0600 |
Matt Mackall |
copies: split the copies api for "normal" and merge cases (API)
|
file |
diff |
annotate
|
| Fri, 16 Dec 2011 19:05:59 -0600 |
Matt Mackall |
merge with stable
|
file |
diff |
annotate
|
| Fri, 16 Dec 2011 21:21:27 +0900 |
FUJIWARA Katsunori |
merge: check filename case collision between changesets for branch merging
stable
|
file |
diff |
annotate
|
| Thu, 15 Dec 2011 14:37:36 -0600 |
Matt Mackall |
merge with stable
|
file |
diff |
annotate
|
| Mon, 12 Dec 2011 17:10:19 +0900 |
FUJIWARA Katsunori |
icasefs: use util.normcase() instead of str.lower() or os.path.normpath()
stable
|
file |
diff |
annotate
|
| Fri, 09 Dec 2011 17:34:53 +0100 |
Martin Geisler |
merge: make debug output easier to read
|
file |
diff |
annotate
|
| Wed, 07 Dec 2011 11:23:01 -0600 |
Kevin Bullock |
merge: make 'nothing to merge' aborts consistent
|
file |
diff |
annotate
|
| Sun, 20 Nov 2011 23:09:32 +0100 |
Mads Kiilerich |
update: don't clobber untracked files with wrong casing
stable
|
file |
diff |
annotate
|
| Wed, 17 Aug 2011 14:11:46 +0200 |
Martin Geisler |
merge: use repo.ui directly instead local variable
|
file |
diff |
annotate
|
| Thu, 28 Jul 2011 14:36:07 +0900 |
FUJIWARA Katsunori |
i18n: use UTF-8 string to lower filename for case collision check
stable
|
file |
diff |
annotate
|
| Fri, 17 Jun 2011 15:21:02 -0500 |
Augie Fackler |
update: check wc.dirty() before setting overwrite=True
|
file |
diff |
annotate
|
| Tue, 31 May 2011 11:52:22 -0700 |
Brendan Cully |
Make pull -u behave like pull && update
|
file |
diff |
annotate
|
| Thu, 26 May 2011 17:15:35 -0500 |
Matt Mackall |
dirstate: rename forget to drop
|
file |
diff |
annotate
|
| Sun, 22 May 2011 11:03:15 +0200 |
Adrian Buehlmann |
applyupdates: audit merged files
|
file |
diff |
annotate
|
| Sat, 21 May 2011 23:21:12 +0200 |
Adrian Buehlmann |
applyupdates: audit path on flag changes
|
file |
diff |
annotate
|
| Sat, 21 May 2011 02:05:00 +0200 |
Adrian Buehlmann |
applyupdates: audit unlinking of renamed files and directories
|
file |
diff |
annotate
|
| Fri, 06 May 2011 15:22:31 +0200 |
Adrian Buehlmann |
rename util.set_flags to setflags
|
file |
diff |
annotate
|
| Fri, 06 May 2011 09:54:06 +0200 |
Adrian Buehlmann |
rename path_auditor to pathauditor
|
file |
diff |
annotate
|
| Mon, 02 May 2011 10:11:18 +0200 |
Dan Villiom Podlaski Christiansen |
prevent transient leaks of file handle by using new helper functions
|
file |
diff |
annotate
|
| Sat, 30 Apr 2011 13:59:14 +0200 |
Alexander Solovyov |
remove unused imports and variables
|
file |
diff |
annotate
|
| Wed, 20 Apr 2011 22:43:31 +0200 |
Adrian Buehlmann |
move path_auditor from util to scmutil
|
file |
diff |
annotate
|
| Mon, 04 Apr 2011 16:21:59 -0500 |
Matt Mackall |
misc: replace .parents()[0] with p1()
|
file |
diff |
annotate
|
| Mon, 04 Apr 2011 15:25:20 -0500 |
Matt Mackall |
merge: add ancestor to the update function
|
file |
diff |
annotate
|
| Wed, 23 Mar 2011 09:20:40 -0500 |
Matt Mackall |
merge with stable
|
file |
diff |
annotate
|
| Tue, 22 Mar 2011 12:00:38 -0500 |
Matt Mackall |
merge: avoid unlinking destination of merge when case changes (issue2715)
stable
|
file |
diff |
annotate
|
| Tue, 08 Mar 2011 01:21:50 +0100 |
Mads Kiilerich |
merge: remove last traces of fastforward merging
|
file |
diff |
annotate
|
| Mon, 07 Mar 2011 15:03:10 -0600 |
Matt Mackall |
merge: back out single-parent fast-forward merge
stable
|
file |
diff |
annotate
|
| Sat, 05 Mar 2011 16:34:59 -0600 |
Matt Mackall |
merge: drop resolve state for mergers with identical contents (issue2680)
|
file |
diff |
annotate
|
| Wed, 16 Feb 2011 08:56:11 -0800 |
Oleg Stepanov |
Do not allow merging with uncommitted changes in a subrepo
stable
|
file |
diff |
annotate
|
| Fri, 24 Dec 2010 15:23:01 +0100 |
Dan Villiom Podlaski Christiansen |
explicitly close files
|
file |
diff |
annotate
|
| Mon, 31 Jan 2011 13:38:00 +0100 |
Martin Geisler |
merge with stable
|
file |
diff |
annotate
|
| Mon, 31 Jan 2011 13:33:41 +0100 |
Erik Zielke |
subrepo: make update -C clean the working directory for svn subrepos
stable
|
file |
diff |
annotate
|
| Sun, 02 Jan 2011 19:34:41 +0100 |
Adrian Buehlmann |
rename util.unlink to unlinkpath
|
file |
diff |
annotate
|
| Mon, 13 Dec 2010 11:46:31 -0500 |
Greg Ward |
merge: document some internal return values.
|
file |
diff |
annotate
|
| Tue, 07 Dec 2010 03:29:21 +0100 |
Mads Kiilerich |
merge: fast-forward merge with descendant
|
file |
diff |
annotate
|
| Sun, 10 Oct 2010 09:50:25 -0500 |
Dan Villiom Podlaski Christiansen |
merge: make 'diverging renames' diagnostic a more helpful note.
|
file |
diff |
annotate
|
| Mon, 02 Aug 2010 07:15:47 +0300 |
timeless |
merge/progress: marking strings for localization
|
file |
diff |
annotate
|
| Sat, 09 Oct 2010 17:02:28 -0500 |
Brodie Rao |
update: use higher level wording for "crosses branches" error
|
file |
diff |
annotate
|
| Sat, 09 Oct 2010 14:50:20 -0500 |
Matt Mackall |
merge: handle no file parent in backwards merge (issue2364)
|
file |
diff |
annotate
|
| Fri, 24 Sep 2010 12:46:54 -0500 |
Matt Mackall |
backout most of 4f8067c94729
|
file |
diff |
annotate
|
| Thu, 23 Sep 2010 00:02:31 -0500 |
Brodie Rao |
cleanup: use x in (a, b) instead of x == a or x == b
|
file |
diff |
annotate
|
| Mon, 06 Sep 2010 17:35:49 +0200 |
Peter Arrenbrecht |
merge: delay writing the mergestate during until commit is called
|
file |
diff |
annotate
|
| Tue, 14 Sep 2010 12:20:51 +0200 |
Adrian Buehlmann |
combine tests
|
file |
diff |
annotate
|
| Wed, 25 Aug 2010 16:23:32 +0200 |
Martin Geisler |
util: remove lexists, Python 2.4 introduced os.path.lexists
|
file |
diff |
annotate
|
| Sat, 21 Aug 2010 10:48:49 -0500 |
Matt Mackall |
merge with stable
|
file |
diff |
annotate
|
| Sat, 21 Aug 2010 10:41:29 -0500 |
Matt Mackall |
merge: move reverse-merge logic out of filemerge (issue2342)
stable
|
file |
diff |
annotate
|
| Wed, 11 Aug 2010 20:16:22 +0800 |
Alecs King |
merge: fix typo in docstring
|
file |
diff |
annotate
|
| Fri, 06 Aug 2010 12:59:13 -0500 |
Matt Mackall |
Merge with stable
|
file |
diff |
annotate
|
| Thu, 05 Aug 2010 16:17:17 -0500 |
Matt Mackall |
merge: drop reference to file contents after write
stable
|
file |
diff |
annotate
|