Thu, 14 Oct 2010 21:37:00 +0200 incoming: rename variable
Nicolas Dumazet <nicdumz.commits@gmail.com> [Thu, 14 Oct 2010 21:37:00 +0200] rev 12729
incoming: rename variable Groundwork so that incoming and graphlog.incoming code look the same and get easier to unify.
Thu, 14 Oct 2010 01:28:29 +0200 import: only the first hg patch marker should be processed (issue2417)
Mads Kiilerich <mads@kiilerich.com> [Thu, 14 Oct 2010 01:28:29 +0200] rev 12728
import: only the first hg patch marker should be processed (issue2417) Proper use of the hgpatch state variable had been lost in the final edits of d7452292f9d3 - now it works more like intended.
Fri, 10 Sep 2010 10:28:18 +0200 backout: provide linear backout as a default (without --merge option)
Gilles Moris <gilles.moris@free.fr> [Fri, 10 Sep 2010 10:28:18 +0200] rev 12727
backout: provide linear backout as a default (without --merge option) This changes backouts changeset to retain linear history, .e. it is committed as a child of the working directory parent, not the reverted changeset parent. The default behavior was previously to just commit a reverted change as a child of the backed out changeset - thus creating a new head. Most of the time, you would use the --merge option, as it does not make sense to keep this dangling head as is. The previous behavior could be obtained by using 'hg update --clean .' after a 'hg backout --merge'. The --merge option itself is not affected by this change. There is also still an autocommit of the backout if a merge is not needed, i.e. in case the backout is the parent of the working directory. Previously we had (pwd = parent of the working directory): pwd older backout auto merge backout --merge auto commit With the new linear approach: pwd older backout auto commit backout --merge auto commit auto: commit done by the backout command merge: backout also already committed but explicit merge and commit needed commit: user need to commit the update/merge
Mon, 11 Oct 2010 10:07:42 -0500 update: use revsingle to enable use of revsets as update targets (issue1993)
Augie Fackler <durin42@gmail.com> [Mon, 11 Oct 2010 10:07:42 -0500] rev 12726
update: use revsingle to enable use of revsets as update targets (issue1993)
Tue, 12 Oct 2010 11:02:45 -0500 test-url: skip test when ssl module is unavailable
Augie Fackler <durin42@gmail.com> [Tue, 12 Oct 2010 11:02:45 -0500] rev 12725
test-url: skip test when ssl module is unavailable
Tue, 12 Oct 2010 11:02:05 -0500 test-url: remove trailing whitespace
Augie Fackler <durin42@gmail.com> [Tue, 12 Oct 2010 11:02:05 -0500] rev 12724
test-url: remove trailing whitespace
Tue, 12 Oct 2010 12:49:23 +0100 keyword: code cleanup
Christian Ebert <blacktrash@gmx.net> [Tue, 12 Oct 2010 12:49:23 +0100] rev 12723
keyword: code cleanup - move preselection of expansion candidates for rollback and record into helper function - same overwrite order in rollback and record: 1. modified, 2. added - self.wlock() inside kwrepo class instead of repo.wlock()
Sat, 02 Oct 2010 22:59:29 +0900 tests: asciify output of test-encoding-align.t
Yuya Nishihara <yuya@tcha.org> [Sat, 02 Oct 2010 22:59:29 +0900] rev 12722
tests: asciify output of test-encoding-align.t
Sat, 02 Oct 2010 22:57:25 +0900 tests: accept \-escaped test output
Yuya Nishihara <yuya@tcha.org> [Sat, 02 Oct 2010 22:57:25 +0900] rev 12721
tests: accept \-escaped test output It changes tsttest to accept expected outputs in python-style \-escapes. It aims to avoid trouble with outputs for non-ascii, color and progress tests.
Tue, 12 Oct 2010 16:26:03 -0500 merge with crew
Matt Mackall <mpm@selenic.com> [Tue, 12 Oct 2010 16:26:03 -0500] rev 12720
merge with crew
(0) -10000 -3000 -1000 -300 -100 -10 +10 +100 +300 +1000 +3000 +10000 +30000 tip