log mercurial/merge.py @ 3885:1e0b94cfba0e

age author description
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