Commits

Show all
Author Commit Message Labels Comments Date
Pierre-Yves David
Merge with Patrick improvement
Tags
0.2.0
Patrick Mézard
obsolete: do not obsolete rebase --detach nullmerge revs Rebase state contains the changesets to rebase as well as 'nullmerge' entries used drive the merge strategy. These nullmerge were not rebased and should be ignored, and certainly not be marked obsolete.
Branches
default
Patrick Mézard
evolve: fix relocate() with removed revision relocate() was not handling the case where the rebased revision was discarded and was raising when trying to update the phase of None.
Branches
default
Patrick Mézard
test-obsolete-rebase.t: test --abort and --continue
Branches
default
Patrick Mézard
obsolete: handle rebase --collapse Recording obsolete in concludenode() did not work for --collapse because only the first revision was passed to the call. The new strategy is to track the rebase state in defineparents() and concludenode() and to create markers only after a successful non-abort call. In theory, this should also fix --continue/--abort cases. The change in test-stabilize-order.t comes from concludenode() no longer c…
Branches
default
Patrick Mézard
test-stabilize-order.t: trace obsolete markers Will prevent breakage in rebase.concludenode() overriding.
Branches
default
Patrick Mézard
test-obsolete-rebase.t: move --keep test from test-obsolete.t
Branches
default
Patrick Mézard
obsolete: handle rebase removing empty changesets The new revision identifier returned by concludenode() was None and was not correctly translated to nullid.
Branches
default
Patrick Mézard
obsolete: add or fix debug commands help
Branches
default
Patrick Mézard
obsolete: do not duplicate command help
Branches
default
Patrick Mézard
obsolete: use new-style command registration
Branches
default
Patrick Mézard
obsolete: make rebase abort with --keep obsolete modifies rebase to mark rebased changesets obsolete instead of stripping them, which makes --keep irrelevant.
Branches
default
Patrick Mézard
obsolete: fix rebase wrapping ui and repo arguments were swapped which made --keep calls traceback.
Branches
default
Patrick Mézard
obsolete: add debugsuccessors command It dumps obsolete changesets and their successors.
Branches
default
Pierre-Yves David
evolve: add alias for kill and stabilize
Branches
default
Pierre-Yves David
merge with 0.1.0 tag
Branches
default
Pierre-Yves David
Added tag 0.1.0 for changeset 6c6bb7a23bb5
Patrick Mézard
stabilize: improve unstable selection heuristic Without argument, stabilize was picking the first in: "unstable() and ((suspended() or obsancestors(::.))::)" which usually returned the "oldest" unstable revision in parent predecessors descendants. This revision is interesting because it usually gives "soft" merges but rebasing it left the working directory on a remote branch, which was very confusing. The new heuristic picks an unstable ch…
Tags
0.1.0
Branches
default
Patrick Mézard
amend: remove useless repo.changelog alias
Branches
default
Pierre-Yves David
README: some more changes
Branches
default
Pierre-Yves David
merge with Arne changes
Branches
default
Patrick Mézard
amend: do not traceback on no-ops If rewrite() generated changeset happened to be an existing one, the call would traceback when trying to obsolete the changeset with itself. Instead, leave gracefully, marking any intermediate changeset extinct.
Branches
default
Patrick Mézard
amend: do not rely on revsingle() default for --change
Branches
default
Patrick Mézard
amend: drop --branches, pick it from working directory The amended changeset branch was picked either from --branch or from the first parent, but the actual working directory branch was ignored. The behaviour is changed so the amended revision branch is picked from the intermediate revision, which branch comes from the usual working directory rules. --branch is thus replaced by "hg branch".
Branches
default
Patrick Mézard
.hgignore: add .rej/.err/.orig and emacs tmp files
Branches
default
Arne Babenhauserheide
added “pull here is OK, too” to the README.
Branches
default
Patrick Mézard
evolve: fix stabilize --any short option It was displayed as --A instead of -A.
Branches
default
Pierre-Yves David
tutorial: zsh fix
Branches
default
Pierre-Yves David
Fix amend and relocate who picked phases data after extinct wher made secret
Branches
default
Pierre-Yves David
zsh does not like "`" in << EOF
Branches
default
  1. Prev
  2. Next