Thu, 22 Mar 2012 17:08:05 -0500 merge with stable
Matt Mackall <mpm@selenic.com> [Thu, 22 Mar 2012 17:08:05 -0500] rev 16279
merge with stable
Thu, 22 Mar 2012 17:07:39 -0500 strip: ignore -n (issue3326) (BC) stable
Matt Mackall <mpm@selenic.com> [Thu, 22 Mar 2012 17:07:39 -0500] rev 16278
strip: ignore -n (issue3326) (BC) -n could be confused for --dry-run by foolhardy users, resulting in permanent data loss. As leaving a backup when none was requested is significantly less disastrous, the short option is silently ignored. Old scripts continue to work, users only get lightly burned.
Thu, 22 Mar 2012 17:07:39 -0500 aliases: use empty string for missing position parameters (issue3331) stable
Matt Mackall <mpm@selenic.com> [Thu, 22 Mar 2012 17:07:39 -0500] rev 16277
aliases: use empty string for missing position parameters (issue3331)
Wed, 21 Mar 2012 16:39:38 -0500 bookmarks: clone non-divergent bookmarks with @ in them stable
Kevin Bullock <kbullock@ringworld.org> [Wed, 21 Mar 2012 16:39:38 -0500] rev 16276
bookmarks: clone non-divergent bookmarks with @ in them
Wed, 21 Mar 2012 17:24:15 +0900 i18n-ja: synchronized with 2338ab19b236 stable
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Wed, 21 Mar 2012 17:24:15 +0900] rev 16275
i18n-ja: synchronized with 2338ab19b236
Thu, 22 Mar 2012 16:54:46 -0500 encoding: tune fast-path of tolocal a bit
Matt Mackall <mpm@selenic.com> [Thu, 22 Mar 2012 16:54:46 -0500] rev 16274
encoding: tune fast-path of tolocal a bit
Thu, 15 Mar 2012 16:57:19 +0100 eol: remove left-over print statements
Martin Geisler <mg@aragost.com> [Thu, 15 Mar 2012 16:57:19 +0100] rev 16273
eol: remove left-over print statements
Thu, 15 Mar 2012 16:52:22 +0100 eol: document why os.utime doesn't work here
Martin Geisler <mg@aragost.com> [Thu, 15 Mar 2012 16:52:22 +0100] rev 16272
eol: document why os.utime doesn't work here I wanted to use os.utime(self.join("eol.cache"), None) as a cleaner way of touching the cache file -- but this fails when the cache doesn't exist.
Sun, 18 Mar 2012 18:21:58 -0500 merge with stable
Matt Mackall <mpm@selenic.com> [Sun, 18 Mar 2012 18:21:58 -0500] rev 16271
merge with stable
Sun, 18 Mar 2012 18:21:32 -0500 merge with i18n stable
Matt Mackall <mpm@selenic.com> [Sun, 18 Mar 2012 18:21:32 -0500] rev 16270
merge with i18n
(0) -10000 -3000 -1000 -300 -100 -10 +10 +100 +300 +1000 +3000 +10000 +30000 tip