Fri, 02 Dec 2011 17:38:07 +0100 convert/svn: update svn working copy only when necessary
Patrick Mezard <pmezard@gmail.com> [Fri, 02 Dec 2011 17:38:07 +0100] rev 15605
convert/svn: update svn working copy only when necessary I have not tried to produce the bug but here is idea: f85c0034a062 stopped passing the modified files list to commit. This makes commit more fragile since we better not touch unrelated files by mistake. But putcommit() still applies file changes before exiting upon ignored revisions. So in theory, we could apply changes from a skipped branch then commit them as part of another revision. This patch makes the sink apply the changes after possibly skipping the revision. The real fix would be to use svn commit --targets option to pass the file names in an argument file. Unfortunately, it seems to be bugged in svn 1.7.1: http://svn.haxx.se/dev/archive-2011-11/0211.shtml
Thu, 01 Dec 2011 17:39:30 -0500 rollback: always call destroyed() (regression from 1.9) stable
Greg Ward <greg-hg@gerg.ca> [Thu, 01 Dec 2011 17:39:30 -0500] rev 15604
rollback: always call destroyed() (regression from 1.9) The contract for repo.destroyed() is that it is called whenever changesets are destroyed, either by strip or by rollback. That contract was inadvertently broken in 7c26ce9edbd2, when we made a chunk of code conditional on destroying one of the working dir's parents. Oops: it doesn't matter *which* changesets are destroyed or what their relationship is to the working dir, we should call repo.destroyed() whenever we destroy changesets.
Thu, 01 Dec 2011 15:57:10 -0600 merge with stable
Matt Mackall <mpm@selenic.com> [Thu, 01 Dec 2011 15:57:10 -0600] rev 15603
merge with stable
Thu, 01 Dec 2011 15:55:37 -0600 Added signature for changeset 195dbd1cef0c stable
Matt Mackall <mpm@selenic.com> [Thu, 01 Dec 2011 15:55:37 -0600] rev 15602
Added signature for changeset 195dbd1cef0c
Thu, 01 Dec 2011 15:55:34 -0600 Added tag 2.0.1 for changeset 195dbd1cef0c stable
Matt Mackall <mpm@selenic.com> [Thu, 01 Dec 2011 15:55:34 -0600] rev 15601
Added tag 2.0.1 for changeset 195dbd1cef0c
Thu, 01 Dec 2011 15:51:36 -0600 alias: shortcut command matching show shadowing works properly (issue3104) stable 2.0.1
Matt Mackall <mpm@selenic.com> [Thu, 01 Dec 2011 15:51:36 -0600] rev 15600
alias: shortcut command matching show shadowing works properly (issue3104) An alias for 'log' was stored in the same command table as '^log|history'. If the hash function happens to give the latter first, the alias is effectively ignored when matching 'log'.
(0) -10000 -3000 -1000 -300 -100 -30 -10 -6 +6 +10 +30 +100 +300 +1000 +3000 +10000 +30000 tip