Mercurial > hg

log mercurial/merge.py @ 15064:1f581a8b1948 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
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
Sat, 21 Aug 2010 10:48:49 -0500 Matt Mackall merge with stable
Sat, 21 Aug 2010 10:41:29 -0500 Matt Mackall merge: move reverse-merge logic out of filemerge (issue2342) stable
Wed, 11 Aug 2010 20:16:22 +0800 Alecs King merge: fix typo in docstring
Fri, 06 Aug 2010 12:59:13 -0500 Matt Mackall Merge with stable
Thu, 05 Aug 2010 16:17:17 -0500 Matt Mackall merge: drop reference to file contents after write stable
Sat, 31 Jul 2010 18:12:50 -0500 Matt Mackall Merge with stable
Fri, 30 Jul 2010 10:32:24 +0300 timeless progress: use gerund (updating) for merge progress stable
Tue, 27 Jul 2010 23:40:46 +0900 Nicolas Dumazet filectx: use cmp(self, fctx) instead of cmp(self, text)
Wed, 30 Jun 2010 23:56:35 -0500 Matt Mackall subrepo: correctly handle update -C with modified subrepos (issue2022) stable
Wed, 30 Jun 2010 17:34:20 -0500 Matt Mackall update: synchronize permissions in the dirstate (issue1473) stable
Fri, 18 Jun 2010 08:49:24 +0200 Peter Arrenbrecht merge: pass constant cset ancestor to fctx.ancestor stable
Sun, 27 Jun 2010 23:12:05 +0200 Martin Geisler resolve: do not crash on empty mergestate stable
Sun, 20 Jun 2010 14:21:56 -0500 Matt Mackall merge: improve merge with ancestor message
Tue, 04 May 2010 09:57:16 +0200 Gilles Moris merge: avoid to break the dirstate copy status on moved files
Wed, 05 May 2010 20:21:57 -0500 Matt Mackall context: only scan unknowns when needed
Tue, 20 Apr 2010 11:17:01 +0200 Benoit Boissinot dirstate: more explicit name, rename normaldirty() to otherparent()
Wed, 17 Feb 2010 15:43:21 +0100 Sune Foldager run commit and update hooks after command completion (issue1827) stable
Sun, 07 Feb 2010 17:44:30 -0600 Augie Fackler update: make calls to ui.progress()
Mon, 25 Jan 2010 00:05:27 -0600 Matt Mackall many, many trivial check-code fixups
Tue, 19 Jan 2010 22:20:08 -0600 Matt Mackall Update license to GPLv2+ stable
Sun, 08 Nov 2009 10:29:52 -0600 Matt Mackall submerge: properly deal with overwrites
Sat, 07 Nov 2009 16:30:42 -0600 Matt Mackall subrepo: notice dirty subrepo states when merging
Thu, 05 Nov 2009 10:53:59 +0100 Stuart W Marks update: allow branch crossing without -c or -C, with no uncommitted changes
Thu, 05 Nov 2009 10:53:36 +0100 Stuart W Marks update: add comments and test cases for updating across branches
Sat, 19 Sep 2009 01:15:38 +0200 Martin Geisler do not attempt to translate ui.debug output
less more | (0) -300 -100 -60 tip