Commits

Author Commit Message Labels Comments Date
Arne Babenhauserheide
raise util.Abort instead of assertion when trying to relocate a merge changeset.
Branches
stable
Pierre-Yves David
merge with stable
Pierre-Yves David
tutorial: fix note We need a double semin colon, otherwise this is a comment.
Branches
stable
Pierre-Yves David
tutorial: warn about rollback beeing obsolete
Branches
stable
Pierre-Yves David
tutorial: use grab instead of rebase. grab as now the advantage to move the working directory.
Branches
stable
Pierre-Yves David
tutorial Clarify "." explanation
Branches
stable
Pierre-Yves David
tutorial: update divergent changeset section Still not there but less fuzy.
Branches
stable
Pierre-Yves David
tutorial: use long form of argument for the sake of clarity
Branches
stable
Pierre-Yves David
tutorial: fix some various typo
Branches
stable
Pierre-Yves David
tutorial Display the help of appropriate command in section that need writting
Branches
stable
Pierre-Yves David
doc: some documentation on the configuration part of the tutorial Trying to make it less obscure on first contact
Branches
stable
Pierre-Yves David
doc: smarter make file We regenerate the tutorials when needed only
Branches
stable
Pierre-Yves David
doc: use a symbolic link to point to the tutorial the file was lagging behind a ton.
Branches
stable
Dan Villiom Podlaski Christiansen
import: warn about new unstable changesets 'hg import' can add new unstable changesets, for example when invoked with '--hidden' or '--exact', or when the working directory parent already is unstable.
Dan Villiom Podlaski Christiansen
evolve: show progress The total count may be too low on occasion. Not sure why. gaved up at testing this, can't get stable result.
Pierre-Yves David
removed the qsync extension. The only user I knew about (logilab) is not using it anymore. It not compatible with coming Mercurial version 2.9.
Pierre-Yves David
evolve: add more details when we abort for case not handled yet Verboser output to help people knowing what is going on and solving it on their own.
Pierre-Yves David
merge stable back into default
Pierre-Yves David
current release is stable enought
Branches
stable
Pierre-Yves David
evolve: update the tested with statement It actually ssems to work with version up to 2.6 but some minor changes makes test fails. so better encourage people to upgrade.
Pierre-Yves David
evolve: use super for calling parent class method Otherwise we can bipass filtering (and break a lot of things)
Faheem Mitha
debian: add source/format file
Pierre-Yves David
Added tag 3.2.0 for changeset c3ba8a965a7a
Pierre-Yves David
prepare 2.8 release
Tags
3.2.0
Pierre-Yves David
grab: update the alias for 2.8 compatibility 2.8 does not update on rebase anymore. We need to update by hand. this makes this alias more fragile.
Dan Villiom Podlaski Christiansen
gdown/gup: add next/previous alias Up and down refer to the customary order in log output rather than concepts; as such, it may be confusing to the user. I for one found them suprising -- they just didn't fit with my mental model. Previous and next, however, imply a clear parent/child relationship. We attroduce the new name as aliases for now.
Dan Villiom Podlaski Christiansen
evolve: allow updating to the successor if the parent is obsolete Although 'hg update' handles this as well, it will also update to tipmost descendent of the successor, if any.
Dan Villiom Podlaski Christiansen
evolve: abort on unknown divergent changeset base ...rather than noisily dying with a KeyError.
Pierre-Yves David
test: prepare test for core changeset 6cd9b8428104 Changeset 6cd9b8428104 in Mercurial core (2.8) make rebase preserve more extra. this mean hash changes. We make the test resilient to that.
Pierre-Yves David
test: prepare test for core changeset 9c78ed396075 New changeset in mercurial 2.8 (9c78ed396075) change rebase behavior to preverse the original working directory. This break an handfull of test so we preventively update to tip after rebase.
  1. Prev
  2. Next