Mercurial > hg
changeset 17336:dd4cd949fa56
Merge with stable
| author | Patrick Mezard <patrick@mezard.eu> |
|---|---|
| date | Sat, 04 Aug 2012 15:58:23 +0200 |
| parents | b950b86ac897 (diff) b5c560787a4e (current diff) |
| children | b131e24e2984 |
| files | |
| diffstat | 2 files changed, 1 insertions(+), 25 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/context.py Thu Aug 02 11:28:21 2012 -0300 +++ b/mercurial/context.py Sat Aug 04 15:58:23 2012 +0200 @@ -885,8 +885,7 @@ p = self._repo.dirstate.parents() if p[1] == nullid: p = p[:-1] - self._parents = [changectx(self._repo, x) for x in p] - return self._parents + return [changectx(self._repo, x) for x in p] def status(self, ignored=False, clean=False, unknown=False): """Explicit status query
--- a/tests/test-convert-mtn-rename-directory.out Thu Aug 02 11:28:21 2012 -0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,23 +0,0 @@ -% tedious monotone keys configuration -% create monotone repository -mtn: adding dir1 to workspace manifest -mtn: adding dir1/subdir1 to workspace manifest -mtn: adding dir1/subdir1/file1 to workspace manifest -mtn: beginning commit on branch 'com.selenic.test' -mtn: committed revision 5ed13ff5582d8d1e319f079b694a37d2b45edfc8 -% rename directory -mtn: skipping dir1, already accounted for in workspace -mtn: renaming dir1/subdir1 to dir1/subdir2 in workspace manifest -mtn: beginning commit on branch 'com.selenic.test' -mtn: committed revision 985204142a822b22ee86b509d61f3c5ab6857d2b -% convert -assuming destination repo.mtn-hg -initializing destination repo.mtn-hg repository -scanning source... -sorting... -converting... -1 initialize -0 rename -1 files updated, 0 files merged, 0 files removed, 0 files unresolved -% manifest -dir1/subdir2/file1