mercurial/merge.py
Sun, 12 Aug 2007 12:15:10 -0300 Alexis S. L. Carvalho merge: fix a copy detection bug (issue672)
Thu, 02 Aug 2007 13:23:53 -0500 Matt Mackall Merge with -stable
Thu, 02 Aug 2007 12:29:10 -0500 Matt Mackall merge: avoid double deletion mentioned in issue636
Wed, 01 Aug 2007 14:03:48 -0500 Matt Mackall Merge with stable
Wed, 01 Aug 2007 12:33:12 -0500 Matt Mackall merge: do early copy to deal with issue636
Thu, 26 Jul 2007 12:02:55 -0500 Matt Mackall Merge with -stable
Thu, 26 Jul 2007 11:19:53 -0500 Matt Mackall merge: don't forget to update the dirstate for exec bit changes
Sat, 21 Jul 2007 16:02:10 -0500 Matt Mackall Make repo locks recursive, eliminate all passing of lock/wlock
Sat, 21 Jul 2007 16:02:10 -0500 Matt Mackall Use try/finally pattern to cleanup locks and transactions
Sat, 21 Jul 2007 16:02:09 -0500 Matt Mackall dirstate: break update into separate functions
Sun, 15 Jul 2007 14:43:38 -0500 Matt Mackall merge: fix unnecessary rename merges on linear update (issue631)
Thu, 05 Jul 2007 16:01:07 -0500 Matt Mackall merge: fix adding untracked files on directory rename (issue612)
Thu, 05 Jul 2007 13:34:18 -0500 Matt Mackall merge: make test for fast-forward merge stricter (issue619)
Fri, 22 Jun 2007 20:44:40 -0300 Alexis S. L. Carvalho merge: fix small bug with a failed merge across a rename
Thu, 21 Jun 2007 18:02:03 -0500 Matt Mackall merge: warn user about divergent renames
Tue, 19 Jun 2007 08:51:34 +0200 Thomas Arendsen Hein Updated copyright notices and add "and others" to "hg version"
Tue, 19 Jun 2007 08:06:37 +0200 Thomas Arendsen Hein Cleanup of whitespace, indentation and line continuation.
Mon, 18 Jun 2007 12:38:54 -0700 Brendan Cully Make fast-forward merges full merges
Tue, 08 May 2007 11:42:48 -0500 Matt Mackall Merge with stable
Tue, 08 May 2007 02:59:13 -0500 Matt Mackall merge: fix spurious merges for copies in linear updates
Sun, 06 May 2007 20:27:45 -0700 Brendan Cully Add fast-forward branch merging
Thu, 03 May 2007 17:27:21 -0500 Matt Mackall Merge with stable
Thu, 03 May 2007 17:24:43 -0500 Matt Mackall merge: reorganize some hunks in findcopies
Thu, 03 May 2007 17:24:43 -0500 Matt Mackall merge: simplify a check in checkcopies
Thu, 03 May 2007 17:24:43 -0500 Matt Mackall merge: expand and simplify the invalid handling for directory moves
Thu, 03 May 2007 17:24:43 -0500 Matt Mackall merge: fix a bug detecting directory moves
Thu, 03 May 2007 17:24:43 -0500 Matt Mackall merge: clarify the findcopies code
Mon, 16 Apr 2007 12:37:30 -0500 Matt Mackall Merge with stable
Mon, 16 Apr 2007 12:24:52 -0500 Matt Mackall merge: fix quadratic behavior in find-copies
Thu, 05 Apr 2007 17:09:31 -0500 Matt Mackall Merge with stable
Thu, 05 Apr 2007 16:43:18 -0500 Matt Mackall merge: fix a bug where copies were ignored
Thu, 05 Apr 2007 16:25:47 -0500 Matt Mackall merge: fix a bug where copies were getting ignored
Fri, 16 Mar 2007 00:45:18 -0300 Alexis S. L. Carvalho Merge with crew-stable
Wed, 14 Mar 2007 01:26:09 -0500 Matt Mackall Merge with -stable, fix small test failure
Sat, 10 Mar 2007 17:45:32 -0800 Brendan Cully Merge with crew-stable
Tue, 13 Mar 2007 18:50:02 -0500 Matt Mackall Move branch read/write to dirstate where it belongs
Tue, 27 Feb 2007 16:47:16 -0600 Matt Mackall Merge with stable
Tue, 27 Feb 2007 16:20:06 -0600 Matt Mackall merge: fix renaming of subdirectories under renamed directories
Fri, 29 Dec 2006 20:04:31 -0600 Matt Mackall symlinks: minimal support for symlinks in merge/update
Fri, 29 Dec 2006 20:04:31 -0600 Matt Mackall symlinks: add flags param to wwrite
Fri, 29 Dec 2006 20:04:31 -0600 Matt Mackall replace filehandle version of wwrite with wwritedata
Thu, 14 Dec 2006 20:25:19 -0600 Matt Mackall Simplify i18n imports
Wed, 13 Dec 2006 13:27:09 -0600 Matt Mackall Replace demandload with new demandimport
Tue, 12 Dec 2006 18:16:23 -0600 Matt Mackall Remove deprecated old-style branch support
Tue, 12 Dec 2006 17:52:33 -0600 Matt Mackall Fix copy detection corner case
Sun, 10 Dec 2006 20:35:28 -0200 Alexis S. L. Carvalho Use UTF-8 in .hg/branch
Mon, 04 Dec 2006 17:10:31 -0600 Matt Mackall imported patch collision
Sun, 03 Dec 2006 16:16:33 -0600 Matt Mackall Handle transcoding of branch names
Thu, 30 Nov 2006 17:36:33 -0600 Matt Mackall merge: handle directory renames
Thu, 30 Nov 2006 17:36:33 -0600 Matt Mackall merge: pull findcopies helpers inside, refactor checkpair to checkcopies
Thu, 30 Nov 2006 17:36:33 -0600 Matt Mackall merge: move check for empty ancestor into findcopies
Thu, 30 Nov 2006 17:36:33 -0600 Matt Mackall merge: only store one direction of copies in the copy map
Thu, 30 Nov 2006 17:36:33 -0600 Matt Mackall merge: add copied hash to simplify copy logic
Thu, 30 Nov 2006 17:36:33 -0600 Matt Mackall merge: remove unused match logic from findcopies
Thu, 30 Nov 2006 17:36:33 -0600 Matt Mackall merge: report destinations of moves in merge action messages
Mon, 27 Nov 2006 15:27:09 -0800 Brendan Cully Make context __eq__ handle arbitrary RHS values
Thu, 23 Nov 2006 22:45:00 -0800 Brendan Cully merge: Don't search for copies across unrelated manifests
Sat, 18 Nov 2006 11:34:19 -0600 Matt Mackall avoid unnecessary copy merges
Fri, 17 Nov 2006 08:06:54 +0100 Thomas Arendsen Hein white space and line break cleanups
Wed, 01 Nov 2006 21:47:55 -0600 Matt Mackall Clarify untracked file merge message
less more (0) -100 -60 tip