Mercurial > hg

log mercurial/merge.py @ 16681:0128cdb846d9 stable

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
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
less more | (0) -300 -100 -60 tip