- Mar 26, 2011
-
-
Stefano Tortarolo authored
Guards on rebased mq patches were lost. This patch restores them after the qimporting step.
-
- Mar 16, 2011
-
-
Bernhard Leiner authored
-
- May 31, 2011
-
-
Matt Mackall authored
-
- May 30, 2011
-
-
Martin Geisler authored
-
- May 19, 2011
-
-
Wagner Bruna authored
-
- May 28, 2011
-
-
Eric Eisner authored
-
- May 19, 2011
-
-
Martin Geisler authored
Failing to do so makes it impossible to use the memctx API to create a changeset with a commit message or username outside of the current encoding.encoding setting.
-
- May 18, 2011
-
-
Martin Geisler authored
Push and pull set repo._subtoppath before pushing or pulling subrepos. The incoming and outgoing commands needed to do the same.
-
Martin Geisler authored
-
Martin Geisler authored
-
Martin Geisler authored
-
Martin Geisler authored
-
- May 14, 2011
-
-
Steve Borho authored
When used as the default merge tool, or used as a --tool override, the simplemerge script should not be allowed to raise a util.Abort just because one of the files being merged is binary. Instead, return 1 and mark the file unresolved.
-
- May 09, 2011
-
-
Martin Geisler authored
-
- May 01, 2011
-
-
Alexander Solovyov authored
Before this patch undo.bookmarks was created on bookmarks write and not with other transaction-related files. There were two issues: first is that if you have changed bookmarks few times after a transaction happened, rollback will give you a state which can point to non-existing revision. Second is that if you have not changed bookmarks after a transaction, rollback will touch your state anyway. This change also adds `localrepo._writejournal` method, which can be used by other extensions to save their transaction-related backup in right time.
-
- May 06, 2011
-
-
Idan Kamara authored
-
- May 05, 2011
-
-
Thomas Arendsen Hein authored
With Python >= 2.6 the original code already works correct, therefore the fix for issue2556 on Python <= 2.5 broke relative subrepositories with newer versions of Python.
-
- May 03, 2011
-
-
Kevin Bullock authored
This makes `hg qpush --exact` work with patches created by `hg export`.
-
- May 01, 2011
-
-
Matt Mackall authored
-
Matt Mackall authored
-
Matt Mackall authored
-
- Apr 29, 2011
-
-
Wagner Bruna authored
-
Wagner Bruna authored
-
Wagner Bruna authored
-
- Apr 25, 2011
-
-
Wagner Bruna authored
-
- Apr 30, 2011
-
-
Nicolas Dumazet authored
Zeroconf launches two threads in the background, and they wait on Condition objects to exit. We need to call Zeroconf.close() to release those conditions so that threads can gracefully exit. This means that an interrupt on the hg process will now gracefully propagate to the Zeroconf children, fixing that bug which did not allow us to kill an `hg serve` process.
-
- Apr 29, 2011
-
-
Idan Kamara authored
When an empty string is being passed to normname it would return '.' causing checkfile() to always return that a patch with that name exists.
-
- Mar 04, 2011
-
-
Patrick Mezard authored
This happens more often than expected. Say you have an svn subrepository with python code. Python would have generated unknown .pyc files. Now, you rebase this setup on a revision where a directory containing python code does not exist. Subversion is first asked to remove this directory when updating, but will not because it contains untracked items. Then it will have to bring back the directory after the merge but will fail because it now collides with an untracked directory. Using --force is not very elegant and only works with svn >= 1.5 but the only alternative I can think of is to write our own purge command for subversion.
-
- Apr 29, 2011
-
-
Augie Fackler authored
$ hg clone repo repo-clone -v updating to branch default resolving manifests getting .hgsub getting .hgsubstate abort: svn: OPTIONS of 'https://subversion.srv/project': Server certificate verification failed: issuer is not trusted (https://subversion.srv)
-
Thomas Arendsen Hein authored
I just had: transferred 606 bytes in 2.9 seconds (211 bytes/sec)
-
Patrick Mezard authored
-
- Apr 26, 2011
-
-
Martin Geisler authored
-
- Apr 25, 2011
-
-
Patrick Mezard authored
-
- Apr 21, 2011
-
-
Matt Mackall authored
-
- Apr 19, 2011
-
-
Wagner Bruna authored
-
Martin Krüger authored
-
- Apr 20, 2011
-
-
Patrick Mezard authored
A branch closing revision only applies if one of its parents belongs to the branch being closed. Otherwise the filemap can prune it too.
-
- Apr 19, 2011
-
-
Kevin Bullock authored
Following on to 1416b9118540, correct a minor grammar issue, re-wrap to 72 columns, and further clarify wording.
-
Martin Geisler authored
Before, there was a race between an access and a modification made within the same second.
-
Martin Geisler authored
Also improved the word order.
-