Skip to content
Snippets Groups Projects
  1. Mar 11, 2010
  2. Mar 10, 2010
    • Greg Ward's avatar
      rebase: improve help text · 86dc2114
      Greg Ward authored
      - add a paragraph about default dest/source changesets
      - option help: say "changeset" not "revision"
      - option help: explain -b/--base better
      - clarify that -a/--abort and -c/--continue are different from the
        other options
      86dc2114
    • Greg Ward's avatar
      rebase: improve help text · 23ab3b05
      Greg Ward authored
      - add a paragraph about default dest/source changesets
      - option help: say "changeset" not "revision"
      - option help: explain -b/--base better
      - clarify that -a/--abort and -c/--continue are different from the
        other options
      23ab3b05
    • Sune Foldager's avatar
  3. Feb 12, 2010
  4. Feb 09, 2010
  5. Feb 06, 2010
    • Stefano Tortarolo's avatar
      rebase: add --detach option to detach intermediate revisions (issue1950) · 66d954e7
      Stefano Tortarolo authored
      When rebasing an intermediate revision, rebase keeps a parent relationship
      with the original parent. This option forces the removal of this relationship.
      In more depth, it 'fakes' null merges between the target revision and the
      ancestors of source, dropping every change from the ancestors.
      The result is that every change in source and its descendants will be rebased,
      ignoring the changes in its ancestors.
      66d954e7
  6. Jan 31, 2010
    • Stefano Tortarolo's avatar
      rebase: refactoring · 38fe86fb
      Stefano Tortarolo authored
      Separate rebase-specific functions, in order to provide a better base to
      extend rebase's capabilities.
      
      Note that this will be useful especially to share functions with 'adapt'.
      38fe86fb
  7. Jan 20, 2010
  8. Nov 09, 2009
    • Christian Boos's avatar
      rebase: make sure the newancestor is used during the whole update · 49efeed4
      Christian Boos authored
      (issue1561)
      
      Before this change, newancestor was used only once as a replacement
      for ancestor.ancestor, but merge.update calls ancestor.ancestor
      several times, so it ends up with the "wrong" ancestor (the real
      ancestor, but we want the parent of the rebased changeset for all but
      the first rebased changeset).
      
      Added a new test case for this: test-rebase-newancestor.
      
      Also, in one scenario in test-rebase-collapse, there was a spurious
      conflict caused by the same issue, so that test case was fixed by
      removing the now unneeded conflict resolution and the output was
      adapted accordingly.
      49efeed4
  9. Oct 15, 2009
  10. Oct 14, 2009
  11. Oct 08, 2009
  12. Sep 18, 2009
  13. Aug 02, 2009
  14. Jul 25, 2009
  15. Jul 22, 2009
    • Martin Geisler's avatar
      merge with crew-stable · 07d127e7
      Martin Geisler authored
      07d127e7
    • Martin Geisler's avatar
      do not translate commit messages · d0225fa2
      Martin Geisler authored
      It is not very helpful to have 'Added tag %s for changeset %s' and
      similar messages translated into different languages when people work
      together using different locales.
      
      We now use English strings without support for translations. If
      needed, the user can still supply a custom string for most commands.
      d0225fa2
  16. Jul 07, 2009
  17. Jun 24, 2009
  18. Jun 01, 2009
  19. May 24, 2009
  20. May 17, 2009
  21. May 01, 2009
  22. Apr 29, 2009
  23. Apr 25, 2009
  24. Apr 27, 2009
  25. Apr 26, 2009
  26. Apr 25, 2009
  27. Apr 21, 2009
  28. Apr 22, 2009
  29. Apr 18, 2009
Loading