Mon, 18 Nov 2013 15:37:09 -0500 templater: only recursively evaluate string literals as templates (issue4103) stable
Matt Mackall <mpm@selenic.com> [Mon, 18 Nov 2013 15:37:09 -0500] rev 20067
templater: only recursively evaluate string literals as templates (issue4103)
Mon, 18 Nov 2013 14:02:26 -0500 templater: fix escaping in nested string literals (issue4102) stable
Matt Mackall <mpm@selenic.com> [Mon, 18 Nov 2013 14:02:26 -0500] rev 20066
templater: fix escaping in nested string literals (issue4102) Before the templater got extended for nested expressions, it made sense to decode string escapes across the whole string. Now we do it on a piece by piece basis.
Sun, 17 Nov 2013 20:22:59 -0500 merge with stable
Matt Mackall <mpm@selenic.com> [Sun, 17 Nov 2013 20:22:59 -0500] rev 20065
merge with stable
Thu, 07 Nov 2013 20:36:26 -0800 shelve: unshelve using an unfiltered repository stable
David Soria Parra <davidsp@fb.com> [Thu, 07 Nov 2013 20:36:26 -0800] rev 20064
shelve: unshelve using an unfiltered repository when evolve is enabled and a hidden obsolete changeset exists in the repository, the strip during unshelve will fail due to filtered revs. we use an unfiltered repository like to repair.strip to strip the proper nodes.
Thu, 07 Nov 2013 01:56:40 +0100 largefiles: update in two steps, handle interrupted updates better stable
Mads Kiilerich <madski@unity3d.com> [Thu, 07 Nov 2013 01:56:40 +0100] rev 20063
largefiles: update in two steps, handle interrupted updates better An update would try to fetch any missing largefiles after having updated normal files and standins. That could fail or be interrupted and would leave the working directory in a state where the largefiles not only were missing but also were scheduled for remove ... and where the old largefile was left in place. Instead we now remove old largefiles before starting to download and update missing largefiles.
Thu, 07 Nov 2013 01:49:48 +0100 largefiles: inline _updatelfile, prepare for further refactorings stable
Mads Kiilerich <madski@unity3d.com> [Thu, 07 Nov 2013 01:49:48 +0100] rev 20062
largefiles: inline _updatelfile, prepare for further refactorings
Thu, 07 Nov 2013 01:48:00 +0100 largefiles: cache largefiles for update, also without printmessage stable
Mads Kiilerich <madski@unity3d.com> [Thu, 07 Nov 2013 01:48:00 +0100] rev 20061
largefiles: cache largefiles for update, also without printmessage
Thu, 07 Nov 2013 01:47:59 +0100 largefiles: cleanup of printmessage handling - the printed flag was redundant stable
Mads Kiilerich <madski@unity3d.com> [Thu, 07 Nov 2013 01:47:59 +0100] rev 20060
largefiles: cleanup of printmessage handling - the printed flag was redundant
Sun, 17 Nov 2013 18:13:55 -0500 test-module-imports: skip on Python < 2.6, since ast is new in 2.6
Augie Fackler <raf@durin42.com> [Sun, 17 Nov 2013 18:13:55 -0500] rev 20059
test-module-imports: skip on Python < 2.6, since ast is new in 2.6
Sun, 17 Nov 2013 17:49:48 -0500 Merge with stable.
Augie Fackler <raf@durin42.com> [Sun, 17 Nov 2013 17:49:48 -0500] rev 20058
Merge with stable.
(0) -10000 -3000 -1000 -300 -100 -10 +10 +100 +300 +1000 +3000 +10000 +30000 tip