log mercurial/merge.py @ 5372:6f6aa7f3bc1c

age author description
Thu, 04 Oct 2007 19:44:37 -0500 Matt Mackall merge: add debug diagnostics for findcopies
Thu, 23 Aug 2007 01:48:29 -0300 Alexis S. L. Carvalho merge: forcefully mark files that we get from the second parent as dirty
Sun, 12 Aug 2007 12:43:52 -0300 Alexis S. L. Carvalho merge with crew-stable
Sun, 12 Aug 2007 12:15:10 -0300 Alexis S. L. Carvalho merge: fix a copy detection bug (issue672)
Fri, 10 Aug 2007 10:46:03 -0700 Bryan O'Sullivan Make audit_path more stringent.
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)