Mercurial > hg

log mercurial/merge.py @ 18399:66cec3c2ee00

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | (0) -300 -100 -60 tip
age author description
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
less more | (0) -300 -100 -60 tip