- Jan 13, 2012
-
-
kiilerix authored
The unstable hashes did for other reasons not show up in the test output.
-
kiilerix authored
- it was left over from the refactoring in d01e28657429.
-
- Jan 11, 2012
-
-
kiilerix authored
-
kiilerix authored
It seems like something that missed the refactoring in 97b734fb9c6f.
-
kiilerix authored
Before the code optimistically relied on savedirty not being called a cancelled transaction. If it was called it could save incorrect data. Instead we now start using the invalidate method introduced in b169ba60eebe.
-
kiilerix authored
It wasn't obvious from the code how qsave mocked around with .hg/patches and .hg/patches.? and what was going on. This makes it more explicit so it will survive future refactorings.
-
kiilerix authored
-
kiilerix authored
-
- Jan 13, 2012
- Jan 11, 2012
-
-
kiilerix authored
-
- Jan 13, 2012
-
-
Matt Mackall authored
-
Matt Mackall authored
-
- Jan 12, 2012
-
-
Andrei Polushin authored
-
- Jan 11, 2012
-
-
Andrei Polushin authored
* * * i18n-ru: editorial for 'diff'
-
Andrei Polushin authored
-
- Jan 10, 2012
-
-
Andrei Polushin authored
-
Andrei Polushin authored
See http://ru.wikipedia.org/wiki/МБ
-
- Jan 11, 2012
-
-
Olav Reinert authored
The output of "hg help" is changed to ensure that the column containing descriptions of commands, extensions, and other topics is correctly alignmened.
-
Olav Reinert authored
The default width of field lists is changed from 12 to 14 to align minirst with the rst2html tool. Shrinking the width of the left column to fit the content is removed, to keep formatting simple and uniform.
-
Na'Tosha Bard authored
There is a bug in the merge process where, if a new largefile is introduced in a merge and the user does not have that largefile in his repo's local store nor in his system cache, the working copy will retain the old largefile. Upon the commit of the merge, the standin is re-written to contain the hash of the old largefile, and the lfdirstate retains a "Modified" status for the file. The end result is that the largefile can show up in the merge commit as "Modified", but the standin has no diff. This is wrong in two ways: 1) Such a "wedged" history with a nonsense change in a commit should not be possible 2) It effectively reverts a largefile to an old version when doing a merge This is caused by the fact that the updatelfiles() command always checks the current largefile's hash against the hash stored in the current node's standin. This is correct behavior in every case except for a merge. When merging, we must assume that the standin in the working copy contains the correct hash, because the original hg.merge() has already updated it for us. This patch fixes the issue by patching the repo object to carry a "_ismerging" attribute, that the updatelfiles() command checks for. When this attribute is found, it checks against the working copy's standin, rather than the standin in the current node.
-
Markus Zapke-Gründemann authored
-
- Jan 12, 2012
-
-
Matt Mackall authored
-
- Jan 11, 2012
-
-
Markus Zapke-Gründemann authored
All directories need a trailing asterisk. Otherwise the files are not excluded from coverage.
-
- Jan 13, 2012
-
-
Martin Geisler authored
-
Martin Geisler authored
-
Martin Geisler authored
-
Martin Geisler authored
-
Martin Geisler authored
-
Martin Geisler authored
We don't mark them as literal text and we mention the short option the first time we talk about a given flag.
-
Martin Geisler authored
-
Martin Geisler authored
-
- Jan 11, 2012
-
-
Yuya Nishihara authored
If file data starts with '\1\n', it will be escaped in the revlog to create an empty metadata block, thus adding four bytes to the size in the revlog size index. There's no way to detect that this has happened in filelog.size() faster than decompressing each revision [1]. For filectx.cmp(), we have the size of the file in the working directory available. If it differs by exactly four bytes, it may be this case, so do a full comparison. [1]: http://markmail.org/message/5akdbmmqx7vq2fsg
-
Matt Mackall authored
-
Matt Mackall authored
-
Matt Mackall authored
-
- Jan 10, 2012
-
-
Wagner Bruna authored
-
Wagner Bruna authored
-