Bryan O'Sullivan <bos@serpentine.com> [Mon, 22 Aug 2005 03:27:27 -0700] rev 1000
Emacs: kill commit buffer once it's done with.
Bryan O'Sullivan <bos@serpentine.com> [Mon, 22 Aug 2005 03:16:32 -0700] rev 999
Emacs: first cut at commit support.
Bryan O'Sullivan <bos@serpentine.com> [Sun, 21 Aug 2005 23:33:02 -0800] rev 998
contrib/patchbomb: Fix buglet with empty cc list.
Bryan O'Sullivan <bos@serpentine.com> [Sun, 21 Aug 2005 23:03:14 -0800] rev 997
Fix handling of addresses in hgrc.
Bryan O'Sullivan <bos@serpentine.com> [Sun, 21 Aug 2005 22:46:57 -0800] rev 996
Emacs: document existing functions.
Bryan O'Sullivan <bos@serpentine.com> [Sun, 21 Aug 2005 21:51:01 -0800] rev 995
Emacs support: add hg-revert-buffer.
mpm@selenic.com [Tue, 23 Aug 2005 12:46:43 -0700] rev 994
Fix callers to file.revision to use file.read
This was causing unchanged files to show up as modified.
mpm@selenic.com [Tue, 23 Aug 2005 02:19:38 -0700] rev 993
Clean up some merge logic
- rename mode to branch_merge
- use explicit update mode
- use negative mtime for updates that set mtime
- expand some cryptic variable names
- elaborate merge dirstate comments
- remove redundant manifest lookup for non-merge case
- remove impossible merge case
- fix up test cases
mpm@selenic.com [Mon, 22 Aug 2005 01:22:29 -0700] rev 992
Fix up some bugs introduced by recent merge changes
- use new changed list to track what files actually got new revlog entries
at commit/rawcommit time
- when updating a file during a merge, don't mark it as completely unchanged
- handle file not being in parent 1 in status
mpm@selenic.com [Sun, 21 Aug 2005 22:03:36 -0700] rev 991
merge: remove remaining mark bits