Mon, 04 Nov 2013 10:52:41 -0200 i18n-pt_BR: synchronized with d24ee6d7d167 stable
Wagner Bruna <wbruna@softwareexpress.com.br> [Mon, 04 Nov 2013 10:52:41 -0200] rev 19990
i18n-pt_BR: synchronized with d24ee6d7d167
Thu, 07 Nov 2013 15:24:23 -0600 date: allow %z in format (issue4040)
Matt Mackall <mpm@selenic.com> [Thu, 07 Nov 2013 15:24:23 -0600] rev 19989
date: allow %z in format (issue4040)
Wed, 06 Nov 2013 16:36:07 -0600 merge with stable
Matt Mackall <mpm@selenic.com> [Wed, 06 Nov 2013 16:36:07 -0600] rev 19988
merge with stable
Wed, 06 Nov 2013 10:20:18 -0800 merge: move forgets to the beginning of the action list stable
Siddharth Agarwal <sid0@fb.com> [Wed, 06 Nov 2013 10:20:18 -0800] rev 19987
merge: move forgets to the beginning of the action list Forgets need to be in the beginning of the action list, same as removes. This lets us avoid clashes in the dirstate where a directory is forgotten and a file with the same name is added, or vice versa.
Fri, 01 Nov 2013 17:08:06 -0700 rebase: fix working copy location after a --collapse (issue4080) stable
Durham Goode <durham@fb.com> [Fri, 01 Nov 2013 17:08:06 -0700] rev 19986
rebase: fix working copy location after a --collapse (issue4080) Rebasing with --collapse would leave the working copy on the parent of the collapsed commit, instead of on the collapsed commit. This fixes that. Also fixes a few tests that already covered this area but had bad data. This also fixes issue3716 where bookmarks are not kept across rebases with --collapse. I updated the test to cover that case as well.
Wed, 06 Nov 2013 12:53:39 -0500 Merge with stable.
Augie Fackler <raf@durin42.com> [Wed, 06 Nov 2013 12:53:39 -0500] rev 19985
Merge with stable.
Mon, 04 Nov 2013 19:59:00 -0800 rebase: fix rebase aborts when 'tip-1' is public (issue4082) stable
Durham Goode <durham@fb.com> [Mon, 04 Nov 2013 19:59:00 -0800] rev 19984
rebase: fix rebase aborts when 'tip-1' is public (issue4082) When aborting a rebase where tip-1 is public, rebase would fail to undo the merge state. This caused unexpected dirstate parents and also caused unshelve to become unabortable (since it uses rebase under the hood). The problem was that rebase uses -2 as a marker rev, and when it checked for immutableness during the abort, -2 got resolved to the second to last entry in the phase cache. Adds a test for the fix. Add exception to phase code to prevent this in the future.
Tue, 05 Nov 2013 13:25:45 -0500 Merge with stable.
Augie Fackler <raf@durin42.com> [Tue, 05 Nov 2013 13:25:45 -0500] rev 19983
Merge with stable.
Sat, 02 Nov 2013 11:25:04 +0100 check-code: prepend warning prefix for repeated warnings only once
Simon Heimberg <simohe@besonet.ch> [Sat, 02 Nov 2013 11:25:04 +0100] rev 19982
check-code: prepend warning prefix for repeated warnings only once When a warning occured several times in one file, "warning: " was prepended several times: examplefile.py:3: > def a(object): warning: this looks wrong examplefile.py:27: > def x(object): warning: warning: this looks wrong
Sat, 02 Nov 2013 11:25:33 +0100 check-code: fix an error message
Simon Heimberg <simohe@besonet.ch> [Sat, 02 Nov 2013 11:25:33 +0100] rev 19981
check-code: fix an error message
Tue, 05 Nov 2013 10:55:45 +0100 test: do not add .pyc and .orig in test-commit-amend.t (issue4085) stable
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Tue, 05 Nov 2013 10:55:45 +0100] rev 19980
test: do not add .pyc and .orig in test-commit-amend.t (issue4085) This makes the test fails with disabled byte-compilation (PYTHONDONTWRITEBYTECODE="1" environmental variable).
Fri, 01 Nov 2013 17:04:18 -0500 Added signature for changeset d825e4025e39 stable
Matt Mackall <mpm@selenic.com> [Fri, 01 Nov 2013 17:04:18 -0500] rev 19979
Added signature for changeset d825e4025e39
Fri, 01 Nov 2013 17:04:14 -0500 Added tag 2.8 for changeset d825e4025e39 stable
Matt Mackall <mpm@selenic.com> [Fri, 01 Nov 2013 17:04:14 -0500] rev 19978
Added tag 2.8 for changeset d825e4025e39
Fri, 01 Nov 2013 17:04:03 -0500 merge with i18n stable 2.8
Matt Mackall <mpm@selenic.com> [Fri, 01 Nov 2013 17:04:03 -0500] rev 19977
merge with i18n
Fri, 01 Nov 2013 11:04:48 -0200 i18n-pt_BR: fix a few missing changes on 95304251c376 stable
Wagner Bruna <wbruna@softwareexpress.com.br> [Fri, 01 Nov 2013 11:04:48 -0200] rev 19976
i18n-pt_BR: fix a few missing changes on 95304251c376
(0) -10000 -3000 -1000 -300 -100 -15 +15 +100 +300 +1000 +3000 +10000 +30000 tip