mpm@selenic.com [Sat, 23 Jul 2005 10:00:56 -0500] rev 768
Fix local file changes being ignored after non-branch merge
Bug introduced in eea96285cbf9
Spotted by TAH
Bryan O'Sullivan <bos@serpentine.com> [Fri, 22 Jul 2005 19:46:02 -0800] rev 767
Update tests to match new addremove chattiness.
Bryan O'Sullivan <bos@serpentine.com> [Fri, 22 Jul 2005 19:45:48 -0800] rev 766
Get addremove to use new walk code.
It is now more verbose than it used to be. If given file names, it
prints nothing, as before. But if given patterns or nothing, it prints
the names of the files it is operating on, to remove that air of mystery.
It also now operates at or below the current directory.
mpm@selenic.com [Fri, 22 Jul 2005 20:07:14 -0500] rev 765
Hack to fix missing '/' problem in URLs
mpm@selenic.com [Fri, 22 Jul 2005 19:23:00 -0500] rev 764
Don't mark files with 'm'erge unless we're actually merging branches
For 3-way merges, we were marking files as 'm', which should only be
used for branch merges. This was causing files to show up in 'hg
status' that aren't actually modified.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 22 Jul 2005 16:27:30 +0100] rev 763
Added deprecation warnings if -t or --text is used for commits.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 22 Jul 2005 16:26:46 +0100] rev 762
Changed more occurances of 'text' to 'message'.
Andrew Thompson <andrewkt@aktzero.com> [Fri, 22 Jul 2005 15:59:13 +0100] rev 761
Change all references to -t --text commit message to -m and --message.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 22 Jul 2005 09:54:22 +0100] rev 760
Changed coding hint to BOM
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 22 Jul 2005 09:40:45 +0100] rev 759
Updated TODO.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 22 Jul 2005 08:58:16 +0100] rev 758
There was an extra space after 'hg id' when there are no tags.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 22 Jul 2005 08:47:35 +0100] rev 757
Updated help strings and test-help:
- options -I/-X: always at the end, don't include them in the synopsis.
- NAME is optional for hg revert
- other small changes.