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. Jun 10, 2012
    • kiilerix's avatar
      tests: add missing trailing 'cd ..' · f2719b387380
      kiilerix authored
      Many tests didn't change back from subdirectories at the end of the tests ...
      and they don't have to. The missing 'cd ..' could always be added when another
      test case is added to the test file.
      
      This change do that tests (99.5%) consistently end up in $TESTDIR where they
      started, thus making it simpler to extend them or move them around.
      f2719b387380
  3. May 01, 2012
  4. Apr 29, 2012
  5. Apr 03, 2012
  6. Dec 26, 2011
  7. 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
  8. 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
  9. Apr 30, 2011
  10. Apr 02, 2011
  11. Oct 09, 2010
  12. Oct 01, 2010
  13. May 21, 2010
  14. May 20, 2010
  15. Apr 26, 2009
  16. Oct 18, 2008
  17. Aug 27, 2008
  18. Aug 20, 2008
  19. Aug 18, 2008
Loading