Mercurial > hg > mercurial-crew-with-dirclash
log mercurial/merge.py @ 5000:54ff1bb4b53a
age | author | description |
---|---|---|
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) |