Skip to content
Snippets Groups Projects
  1. Jun 20, 2012
    • Pierre-Yves David's avatar
      rebase: do not add second parent to rebased changeset (drop detach option) (BC) · 50f434510da6
      Pierre-Yves David authored
      Rebase now behaves as if --detach was always passed. Non-merges are
      rebased as non-merges, regardless of their parent being an ancestor of
      the destination. Merges will usually be rebased as merges unless both of
      their parents are ancestors of the destination, or one of their parents
      is pruned when rebased.
      
      This only alters the behavior of rebase when using the --source/--rev
      options. --detach option is deprecated.
      
      All test changes were carefully validated.
      50f434510da6
  2. Apr 27, 2012
  3. Apr 03, 2012
  4. Jan 20, 2012
  5. Jan 17, 2012
  6. Dec 26, 2011
  7. Nov 07, 2011
  8. Oct 15, 2011
    • Pierre-Yves David's avatar
      rebase: add --rev option to rebase · 6cb6064f1d50
      Pierre-Yves David authored
      This option allow a strict set of revision to be specified instead of using -s
      or -b. Rebase will refuse start if striping  rebased changeset will strip non
      rebased changeset. Rebase will refuse to work on set with multiple root.
      6cb6064f1d50
    • Pierre-Yves David's avatar
      rebase: use revset as soon as possible in internal logic · 3bfdfefea2fc
      Pierre-Yves David authored
      The buildstate function now take a set of revs. Logic related to --source and
      --base option have been moved in the main rebase function.
      
      In the process this fixes a bug where the wrong source changeset might be pick.
      This explain the changes in hgext/rebase.py
      3bfdfefea2fc
  9. Sep 19, 2011
    • Pierre-Yves David's avatar
      rebase: allow rebase to ancestor (issue3010) · 81f76098211e
      Pierre-Yves David authored
      We only deny rebasing onto direct parent. Thanks to the ancestor argument of
      merge. the "implementation" of this feature only consist in loosing the check
      and imply detach when rebasing on ancestor.
      81f76098211e
  10. Apr 30, 2011
  11. Oct 09, 2010
  12. Oct 01, 2010
  13. May 21, 2010
  14. May 20, 2010
  15. Oct 08, 2009
    • Sune Foldager's avatar
      rebase: return early when source is descendant of destination · 341182ac95e4
      Sune Foldager authored
      This only happens when using --base (or no source selection options), as
      rebase already aborts in this situation when using --source.
      
      Without this change you get an abort from the underlying merge, and the
      repository is in a different state than you started with (the working
      dir parent is changed).
      341182ac95e4
  16. Apr 26, 2009
  17. Aug 20, 2008
  18. Aug 18, 2008
Loading