Patrick Mezard <pmezard@gmail.com> [Sun, 23 Jan 2011 15:21:56 +0100] rev 13294
record: simplify header methods with util.any
Patrick Mezard <pmezard@gmail.com> [Sun, 23 Jan 2011 15:21:37 +0100] rev 13293
record: refactor the prompt loop
The previous loop was iterating over a mixed header/hunk stream. It may have
been more generic in the sense every item in the stream could trigger a prompt
but it required more work to skip items properly. It can be rewritten in a more
intuitive way by looping on files then looping on hunks.
Patrick Mezard <pmezard@gmail.com> [Sun, 23 Jan 2011 15:21:34 +0100] rev 13292
test-record: test peculiar changes numbering
Patrick Mezard <pmezard@gmail.com> [Sun, 23 Jan 2011 13:01:17 +0100] rev 13291
record: turn prompt() into a pure function
Patrick Mezard <pmezard@gmail.com> [Sun, 23 Jan 2011 12:44:05 +0100] rev 13290
record: turn consumefile() into a pure function
Patrick Mezard <pmezard@gmail.com> [Sun, 23 Jan 2011 12:30:15 +0100] rev 13289
hghave: remove unused hotshot check
Patrick Mezard <pmezard@gmail.com> [Sat, 22 Jan 2011 16:29:10 +0100] rev 13288
Merge with stable
Patrick Mezard <pmezard@gmail.com> [Sat, 22 Jan 2011 16:15:40 +0100] rev 13287
subrepo: compare svn subrepo state to last committed revision
A subversion project revisions are a subset of the repository revisions, you
can ask subversion to update a working directory from one revision to another
without changing anything. Unfortunately, Mercurial will think the
subrepository has changed and will commit it again. To avoid useless commits,
we compare the subrepository state to its actual "parent" revision. To ensure
ascending compatibility with existing subrepositories which might reference
fake revisions, we also keep comparing with the subrepo working directory
revision.
NOTE: not sure if this should go in stable or not.