log mercurial/merge.py @ 16092:914bc95e227b

age author description
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