log mercurial/merge.py @ 10431:ba5e508b5e92

age author description
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
Sun, 21 Jun 2009 01:13:19 +0200 Simon Heimberg ui: extract choice from prompt
Sun, 05 Jul 2009 11:01:01 +0200 Alejandro Santos compat: can't compare two values of unequal datatypes
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