Commits

Author Commit Message Labels Comments Date
Peter Arrenbrecht
build: add octopus tests
Branches
stable
Peter Arrenbrecht
add file-level octopus merge resolution (issue #37)
Branches
stable
Peter Arrenbrecht
clean up cmdtable help texts
Branches
stable
Peter Arrenbrecht
pmerge: simplify octopus merge logic a bit
Branches
stable
Peter Arrenbrecht
merge with stable
Branches
crew
Peter Arrenbrecht
use --date '0 0' in tests
Branches
stable
Peter Arrenbrecht
merge with stable
Branches
crew
Peter Arrenbrecht
peditmessage: really use -m argument (closes #41)
Branches
stable
Peter Arrenbrecht
pexport: add --no-series option to cmdtable (closes #44)
Branches
stable
Peter Arrenbrecht
clarify license as GPL v2 or higher (closes #43)
Branches
stable
Peter Arrenbrecht
minor adjustments in test scripts for hg 1.4
Branches
crew
Peter Arrenbrecht
merge with stable
Branches
crew
Peter Arrenbrecht
make --tips the default for pdiff, pexport, pemail (used to be --rev .) This is more natural because it avoids the problem that a patch might not be visible from the working copy's parent. It does add the danger that people submit with outstanding pmerges.
Branches
stable
Peter Arrenbrecht
use branch tip for all patches in --tips
Branches
stable
Peter Arrenbrecht
make --tips use diff bases as recorded, not tips This is in preparation for making --tips default for pdiff et al, instead of --rev . As disussed with peso on IRC.
Branches
stable
Peter Arrenbrecht
merge with stable
Branches
crew
Peter Arrenbrecht
make peditmessage use current working copy if modified (issue #31)
Branches
stable
Peter Arrenbrecht
show and test --close-branch in tutorial for deleting a patch
Branches
stable
Peter Arrenbrecht
merge with stable
Branches
crew
Peter Arrenbrecht
add test for pmerge review with base patch as first parent (issue #32)
Branches
stable
Peter Arrenbrecht
fix updateto when not on branch tip (broke pmerge)
Branches
stable
Peter Arrenbrecht
import node.hex and use it directly
Branches
stable
Peter Arrenbrecht
switch order of parents in pmerge (issue #32)
Branches
stable
Peter Arrenbrecht
merge with stable
Branches
crew
Peter Arrenbrecht
pmerge: use consistent head order so tests are reproducible
Branches
stable
Peter Arrenbrecht
merge with stable
Branches
crew
Peter Arrenbrecht
merge fix
Branches
stable
Peter Arrenbrecht
pmerge: use update --clean internally
Peter Arrenbrecht
pmerge: handle empty default branch gracefully (issue #35)
Branches
stable
Peter Arrenbrecht
pstatus: handle empty default branch gracefully (issue #35)
Branches
stable
  1. Prev
  2. Next