Commits

Author Commit Message Labels Comments Date
Pierre-Yves David
[obsolete] fix revset error message
Pierre-Yves David
evolve: warn when latecomer changeset are created
Pierre-Yves David
obsolete: detect late comer during push
Pierre-Yves David
obsolete: add latecomer computation and display
Pierre-Yves David
obsolete: add precursors and successors revset.
Pierre-Yves David
update revset vocabulary to use precursors, successors
Pierre-Yves David
obsolete: remove unused variable in rebase wrapping
Patrick Mézard
evolve: tidy up a bit - long lines - extra blank lines - commands options descriptions
Patrick Mézard
obsolete: make collapse create less markers Collapsing A and B into C was registering: A -> C B -> C A -> B At this point, the last relation brings nothing and is removed for the sake of simplicity: A -> C B -> C test-evolve.t is slightly modified as one of the relations let stabilize compute a target outside of the parent revision tree. This is a stabilize bug, not trivial to fix, so let's tweak the test for now.
Patrick Mézard
obsolete: remove unused code from reposetup()
Patrick Mézard
obsolete: suspended changeset with secret only children should be secret too test-obsolete-push.t: exhibit outgoing bug with suspended changeset in this case
Patrick Mézard
obsolete: add 'obsolete' keyword The obsolete keyword displays the node status among 'stable', 'unstable', 'suspended', 'extinct'.
Patrick Mézard
obsolete: unify collapsed revisions markers handling When collapsing A, B and C into D, amend was registering: A -> D B -> D A -> B C -> D A -> C while the rebase wrapper was doing: A -> D B -> D C -> D At this point, I have no argument to favor one or another or even a new one like: A -> B B -> C C -> D so I am aligning the rebase implementation on the older amend one. At least we can now change them all at once.
Patrick Mézard
rebase: improve invalid revisions filtering - Filter rebasestate nullmerge and unrebased revision before considering updating obsolete. This simplifies the handling of obsolete and make it ignore unrebased revision rather than extinguishing them. - Apply obsolete markers only if rebasestate is not empty, testing rebasetarget was irrelevant.
Patrick Mézard
test-evolve: extend output and exhibit an amend bug The extended section shows the parent revision stabilizing itself on another revision, without --any. In theory, only descendants of the parent predecessors or of its descendants should be stabilized, and be stabilized in parent subtree. Unfortunately, stabilize implementation correctly picks the changesets to stabilize but not their target. This problem is aggravated by amend registering too man…
Patrick Mézard
evolve: remove --change . == --change .^ crazyness
Patrick Mézard
evolve: use explicit phase constants
Pierre-Yves David
[doc] update readme
Branches
stable
Pierre-Yves David
[doc] have people update on stable after cloning
Branches
stable
Pierre-Yves David
merge with fix
Pierre-Yves David
merge with fix
Branches
stable
David Douard
[qsync] fix: 'newerversion' expect node id, not hexid
Pierre-Yves David
merge back with stable tag
Pierre-Yves David
Added tag 0.2.0 for changeset d3f20770b86a
Branches
stable
Pierre-Yves David
Merge with Patrick improvement
Tags
0.2.0
Branches
stable
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.
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.
Patrick Mézard
test-obsolete-rebase.t: test --abort and --continue
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…
Patrick Mézard
test-stabilize-order.t: trace obsolete markers Will prevent breakage in rebase.concludenode() overriding.
  1. Prev
  2. Next