Thu, 01 Mar 2012 16:28:24 -0600 Added signature for changeset 53e2cd303ecf stable
Matt Mackall <mpm@selenic.com> [Thu, 01 Mar 2012 16:28:24 -0600] rev 16204
Added signature for changeset 53e2cd303ecf
Thu, 01 Mar 2012 16:27:59 -0600 Added tag 2.1.1 for changeset 53e2cd303ecf stable
Matt Mackall <mpm@selenic.com> [Thu, 01 Mar 2012 16:27:59 -0600] rev 16203
Added tag 2.1.1 for changeset 53e2cd303ecf
Thu, 01 Mar 2012 17:49:59 +0200 dirstate: filecacheify _ignore (issue3278) stable 2.1.1
Idan Kamara <idankk86@gmail.com> [Thu, 01 Mar 2012 17:49:59 +0200] rev 16202
dirstate: filecacheify _ignore (issue3278) This still doesn't handle the case where a command is run with --config ui.ignore=path since we only look for changes in .hgignore.
Thu, 01 Mar 2012 17:42:49 +0200 dirstate: filecacheify _branch stable
Idan Kamara <idankk86@gmail.com> [Thu, 01 Mar 2012 17:42:49 +0200] rev 16201
dirstate: filecacheify _branch The opener is relative to .hg, use it in a subclass of filecache to compute the final path.
Thu, 01 Mar 2012 17:39:58 +0200 dirstate: add filecache support stable
Idan Kamara <idankk86@gmail.com> [Thu, 01 Mar 2012 17:39:58 +0200] rev 16200
dirstate: add filecache support
Thu, 01 Mar 2012 17:39:58 +0200 scmutil: add join method to opener to construct path relative to base stable
Idan Kamara <idankk86@gmail.com> [Thu, 01 Mar 2012 17:39:58 +0200] rev 16199
scmutil: add join method to opener to construct path relative to base Useful when we only have the opener without the base path used when it was constructed.
Thu, 01 Mar 2012 17:39:58 +0200 filecache: refactor path join logic to a function stable
Idan Kamara <idankk86@gmail.com> [Thu, 01 Mar 2012 17:39:58 +0200] rev 16198
filecache: refactor path join logic to a function New users of filecache use different names for the function used to compute the runtime path of the cached file. Users should subclass filecache and provide their own version of this function to call the appropriate join function on 'obj' (an instance of the class that its member function was decorated).
Wed, 29 Feb 2012 17:27:24 -0600 merge with stable
Matt Mackall <mpm@selenic.com> [Wed, 29 Feb 2012 17:27:24 -0600] rev 16197
merge with stable
Wed, 29 Feb 2012 14:24:57 +0100 subrepo: fix for merge inconsistencies stable
Friedrich Kastner-Masilko <kastner_masilko@at.festo.com> [Wed, 29 Feb 2012 14:24:57 +0100] rev 16196
subrepo: fix for merge inconsistencies Merging ancestors with children is allowed if they are on different named branches. This did not work for subrepo merges before. To fix this inconsistency, the mergefunc() will now use the simple update path only if both versions are on the same named branch. If not, they get merged into a new changeset, just as if you did the merge from the subrepo's root directly.
Wed, 29 Feb 2012 14:41:11 +0100 bundlerepo: bundle repos should be non-publishing (issue3266) stable
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 29 Feb 2012 14:41:11 +0100] rev 16195
bundlerepo: bundle repos should be non-publishing (issue3266) Bundle repo contains both the bundle content and the content of the repository used as a base. This create bugs with phases exchange because the "remote" repository claim to contains changeset it does not. The easiest way to fix this bug is to ensure a bundle repo as non publishing. This way changeset will be seen in the same phase than locally. This patch does not alter in which phase bundle revision are seen. For now they are seen as if an old client had add them on the remote: They inherit their phase from parent whatever the parent is. This is to be fixed in a later patch
(0) -10000 -3000 -1000 -300 -100 -10 +10 +100 +300 +1000 +3000 +10000 +30000 tip