mercurial/merge.py
Mon, 15 Jun 2009 02:45:38 -0500 Matt Mackall subrepo: add update/merge logic
Mon, 08 Jun 2009 18:14:44 -0500 Matt Mackall merge: refactor manifestmerge init to better report effective ancestor
Mon, 08 Jun 2009 18:14:44 -0500 Matt Mackall merge: simplify file revision comparison logic
Mon, 08 Jun 2009 18:14:44 -0500 Matt Mackall merge: make locally-added file test more correct
Mon, 08 Jun 2009 18:14:44 -0500 Matt Mackall merge: drop unused diverge initialization
Mon, 08 Jun 2009 18:14:44 -0500 Matt Mackall merge: refactor some initialization, drop backwards var
Mon, 08 Jun 2009 18:14:44 -0500 Matt Mackall merge: combine a copy and move case
Mon, 08 Jun 2009 18:14:44 -0500 Matt Mackall merge: drop a flag update case
Mon, 08 Jun 2009 18:14:44 -0500 Matt Mackall merge: combine three identical 'remote is newer' cases
Mon, 08 Jun 2009 18:14:44 -0500 Matt Mackall merge: drop 'remote deleted' case
Mon, 08 Jun 2009 18:14:44 -0500 Matt Mackall merge: simplify 'other deleted' case
Mon, 08 Jun 2009 18:14:44 -0500 Matt Mackall merge: simplify backwards revert test, ready to combine with other cases
Mon, 08 Jun 2009 18:14:44 -0500 Matt Mackall merge: allow merging going backwards
Mon, 08 Jun 2009 18:14:44 -0500 Matt Mackall merge: reorder remote creation tests
Mon, 08 Jun 2009 18:14:44 -0500 Matt Mackall merge: drop recreating case
Mon, 08 Jun 2009 18:14:44 -0500 Matt Mackall merge: drop an overwrite test
Mon, 08 Jun 2009 18:14:44 -0500 Matt Mackall merge: simplify a delete case
Mon, 08 Jun 2009 18:14:44 -0500 Matt Mackall merge: reorder get cases for future simplification
Mon, 08 Jun 2009 18:14:44 -0500 Matt Mackall merge: fix prompt keep
Mon, 08 Jun 2009 18:14:44 -0500 Matt Mackall merge: remove a flags case
Mon, 08 Jun 2009 18:14:44 -0500 Matt Mackall merge: pretend ancestor is local to simplify backwards and overwrite
Mon, 08 Jun 2009 18:14:44 -0500 Matt Mackall merge: simplify flag merging code slightly
Fri, 22 May 2009 11:42:21 -0500 Steve Borho merge: give hint as to how to discover uncommitted changes
Tue, 19 May 2009 03:59:58 +0200 Benoit Boissinot update --clean: do not unlink added files (issue575)
Wed, 13 May 2009 14:08:39 +0200 Dirkjan Ochtman some modernization cleanups, forward compatibility
Tue, 28 Apr 2009 17:40:46 +0200 Simon Heimberg separate import lines from mercurial and general python modules
Thu, 30 Apr 2009 10:15:32 -0500 Steve Borho ui: replace regexp pattern with sequence of choices
Sun, 26 Apr 2009 01:08:54 +0200 Martin Geisler updated license to be explicit about GPL version 2
Wed, 22 Apr 2009 00:57:28 +0200 Martin Geisler replace set-like dictionaries with real sets
Wed, 22 Apr 2009 02:01:22 +0200 Ronny Pfannschmidt switch lock releasing in the core from gc to explicit
Mon, 16 Mar 2009 16:58:41 -0500 Matt Mackall resolve: move reset to localrepo.commit
Sun, 15 Feb 2009 10:50:48 -0600 Matt Mackall merge: mark kept local files as readded on linear update (issue539)
Tue, 13 Jan 2009 23:17:19 +0100 Patrick Mezard Merge with crew-stable
Tue, 13 Jan 2009 22:41:06 +0100 Patrick Mezard merge: fix execute bit update issue introduced by 89207edf3973
Mon, 12 Jan 2009 09:16:03 +0100 Dirkjan Ochtman use dict.iteritems() rather than dict.items()
Wed, 07 Jan 2009 02:11:17 +0100 Benoit Boissinot correctly update dirstate after update+mode change (issue1456)
Wed, 08 Oct 2008 16:22:08 -0500 Matt Mackall merge: fix bug going backwards for already reverted files (issue1303)
Sun, 31 Aug 2008 16:12:02 +0200 Martin Geisler i18n: mark strings for translation in Mercurial
Tue, 12 Aug 2008 17:47:08 +0200 Dirkjan Ochtman merge with crew-stable
Sun, 10 Aug 2008 21:55:06 -0500 Matt Mackall util: set_flags shouldn't know about repo flag formats
Tue, 01 Jul 2008 17:59:31 +0100 Paul Moore Sort removes first when applying updates (fixes issues 750 and 912)
Fri, 27 Jun 2008 18:28:45 -0500 Matt Mackall util: add sort helper
Thu, 26 Jun 2008 14:35:46 -0500 Matt Mackall use repo[changeid] to get a changectx
Thu, 26 Jun 2008 13:58:24 -0500 Matt Mackall rename checkfolding to checkcase
Thu, 26 Jun 2008 13:46:29 -0500 Matt Mackall use repo.changectx(None) to get a workingctx
Sat, 12 Apr 2008 20:51:26 +0200 Patrick Mezard merge: replace readline() call, missing from posixfile_nt
Fri, 11 Apr 2008 12:52:56 -0500 Matt Mackall resolve: new command
Fri, 11 Apr 2008 12:04:26 +0200 Dirkjan Ochtman python-2.6: use sha wrapper from util for new merge code
Thu, 10 Apr 2008 15:02:24 -0500 Matt Mackall merge: introduce mergestate
Sat, 29 Mar 2008 12:39:47 -0500 Matt Mackall copies: skip directory rename checks when not merging
Mon, 24 Mar 2008 20:28:13 +0100 Thomas Arendsen Hein Fix missing space in one of the new update messages.
Mon, 24 Mar 2008 10:01:05 -0500 Matt Mackall update: better logic and messages for updates
Sat, 22 Mar 2008 13:30:08 -0500 Matt Mackall update: no -C needed to switch branches without outstanding changes
Sat, 15 Mar 2008 10:02:31 -0500 Matt Mackall diff: use copy smarts from copies.py
Sat, 15 Mar 2008 10:02:31 -0500 Matt Mackall copies: move findcopies code to its own module
Sat, 15 Mar 2008 10:02:31 -0500 Matt Mackall merge: move symmetricdifferences to ancestor.py
Sat, 15 Mar 2008 10:02:31 -0500 Matt Mackall merge: simplify some helpers
Sat, 15 Mar 2008 10:02:31 -0500 Matt Mackall merge: more simplifications to checkcopies
Sat, 15 Mar 2008 10:02:31 -0500 Matt Mackall merge: simplify checkcopies
Sat, 15 Mar 2008 10:02:31 -0500 Matt Mackall merge: privatize some functions, unnest some others
less more (0) -100 -60 tip