Mercurial > hg > mercurial-crew-with-dirclash

log mercurial/merge.py @ 4373:109077e7048d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | (0) -100 -50 -30 tip
age author description
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
Tue, 13 Mar 2007 18:50:02 -0500 Matt Mackall Move branch read/write to dirstate where it belongs
Sat, 10 Mar 2007 17:45:32 -0800 Brendan Cully Merge with crew-stable
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
less more | (0) -100 -50 -30 tip