Wed, 16 Nov 2011 12:53:10 +0100 import: fix parent selection when importing merges stable
Patrick Mezard <pmezard@gmail.com> [Wed, 16 Nov 2011 12:53:10 +0100] rev 15511
import: fix parent selection when importing merges With "wp1" and "wp2" the current working directory parents, "p1" and "p2" the patch parents and "parents" the resulting commit parents, the current behaviour is: --bypass --exact p2 parents 0 0 0 [wp1, wp2] 0 0 1 [wp1, wp2]/buggy 0 1 0 [p1] 0 1 1 [p1, p2] 1 0 0 [wp1, wp2] 1 0 1 [p1, p2] 1 1 0 [p1] 1 1 1 [p1, p2] The original behaviour before f53dc0787424 was: --bypass --exact p2 parents 0 0 0 [wp1, wp2] 0 0 1 if p1 == wp1 then [p1, p2] otherwise [wp1, wp2] 0 1 0 [p1] 0 1 1 [p1, p2] This patch restores the previous behaviour when --bypass is not set, and align --bypass behaviour when --exact is not set with merge diffs.
Mon, 14 Nov 2011 18:16:01 +0100 patch: simplify hunk extents parsing
Patrick Mezard <pmezard@gmail.com> [Mon, 14 Nov 2011 18:16:01 +0100] rev 15510
patch: simplify hunk extents parsing Do not capture unwanted groups in regexps
Sun, 13 Nov 2011 21:37:14 +0100 diff: --ignore-blank-lines was too enthusiastic stable
Patrick Mezard <pmezard@gmail.com> [Sun, 13 Nov 2011 21:37:14 +0100] rev 15509
diff: --ignore-blank-lines was too enthusiastic It was ignoring changes from: ab to: a b
Sat, 12 Nov 2011 14:00:25 +0100 graft: disallow grafting grafted csets in specific situations (issue3091) stable
Stefano Tortarolo <stefano.tortarolo@gmail.com> [Sat, 12 Nov 2011 14:00:25 +0100] rev 15508
graft: disallow grafting grafted csets in specific situations (issue3091) In particular, we do not allow: - grafting an already grafted cset onto its original branch - grafting already grafted csets with the same origin onto each other
Sat, 12 Nov 2011 11:23:52 +0100 graft: use revs to make tests more readable stable
Stefano Tortarolo <stefano.tortarolo@gmail.com> [Sat, 12 Nov 2011 11:23:52 +0100] rev 15507
graft: use revs to make tests more readable
Sat, 12 Nov 2011 13:15:40 +0100 graft: preserve original source in subsequent grafts stable
Stefano Tortarolo <stefano.tortarolo@gmail.com> [Sat, 12 Nov 2011 13:15:40 +0100] rev 15506
graft: preserve original source in subsequent grafts
Sun, 13 Nov 2011 00:29:26 +0000 makedate: wrong timezone offset if DST rules changed this year (issue2511) stable
Dmitry Panov <dop@itoolabs.com> [Sun, 13 Nov 2011 00:29:26 +0000] rev 15505
makedate: wrong timezone offset if DST rules changed this year (issue2511) Python's time module sets timezone and altzone based on UTC offsets of two dates: first and middle day of the current year. This approach doesn't work on a year when DST rules change. For example Russia abandoned winter time this year, so the correct UTC offset should be +4 now, but time.timezone returns 3 hours difference because that's what it was on 01.01.2011. Related python issue: http://bugs.python.org/issue1647654
Thu, 17 Nov 2011 15:44:37 -0600 posix: fix findexe() to check for file type and access
Marc-Antoine Ruel <maruel@google.com> [Thu, 17 Nov 2011 15:44:37 -0600] rev 15504
posix: fix findexe() to check for file type and access
Tue, 15 Nov 2011 02:44:55 +0100 forget: use forward slashes for internal paths
Mads Kiilerich <mads@kiilerich.com> [Tue, 15 Nov 2011 02:44:55 +0100] rev 15503
forget: use forward slashes for internal paths forget into a subrepo failed on windows because pathes were joined with \.
Fri, 11 Nov 2011 01:25:47 +0100 check-code: add --nolineno option for hiding line numbers
Mads Kiilerich <mads@kiilerich.com> [Fri, 11 Nov 2011 01:25:47 +0100] rev 15502
check-code: add --nolineno option for hiding line numbers This makes the output more stable when it is used as a whitelist.
(0) -10000 -3000 -1000 -300 -100 -10 +10 +100 +300 +1000 +3000 +10000 +30000 tip