Brodie Rao <brodie@bitheap.org> [Sun, 12 Sep 2010 18:05:53 -0500] rev 792
merge: suggest 'hg up -C .' for discarding changes, not 'hg up -C'
Without specifying the parent revision of the working copy, users will
update to tip, which is most likely the other head they were trying to
merge, not the revision they were at before the merge.
[ original upstream message ]
Christian Ebert <blacktrash@gmx.net> [Fri, 10 Sep 2010 21:22:11 +0200] rev 791
(stable) merge
Christian Ebert <blacktrash@gmx.net> [Fri, 10 Sep 2010 16:58:13 +0200] rev 790
Explain file-wise expansion in help
Christian Ebert <blacktrash@gmx.net> [Fri, 03 Sep 2010 15:59:08 +0100] rev 789
Merge with stable
Martin Geisler <mg@lazybytes.net> [Fri, 03 Sep 2010 12:58:51 +0200] rev 788
diff: recurse into subrepositories with --subrepos/-S flag
[ original upstream message ]
Christian Ebert <blacktrash@gmx.net> [Tue, 31 Aug 2010 18:18:28 +0100] rev 787
Merge with stable
Nicolas Dumazet <nicdumz.commits@gmail.com> [Mon, 30 Aug 2010 13:15:30 +0900] rev 786
test-keyword: use regular expressions instead of grepping
[ original upstream message]
Christian Ebert <blacktrash@gmx.net> [Mon, 16 Aug 2010 01:01:41 +0100] rev 785
Merge with stable
Matt Mackall <mpm@selenic.com> [Sun, 15 Aug 2010 13:26:12 -0500] rev 784
tests: drop big sed from test-keyword.t
[ original upstream message ]
Christian Ebert <blacktrash@gmx.net> [Mon, 16 Aug 2010 01:00:29 +0100] rev 783
(stable) merge
Christian Ebert <blacktrash@gmx.net> [Sat, 14 Aug 2010 09:47:57 +0100] rev 782
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net> [Sat, 14 Aug 2010 09:47:41 +0100] rev 781
Merge with stable
Matt Mackall <mpm@selenic.com> [Fri, 14 May 2010 10:01:09 -0500] rev 780
rollback: fix up tests
[ original upstream message ]
Christian Ebert <blacktrash@gmx.net> [Sat, 14 Aug 2010 09:42:14 +0100] rev 779
Merge after backout