Skip to content
Snippets Groups Projects
  1. Jul 18, 2011
  2. Apr 30, 2011
    • Nicolas Dumazet's avatar
      tests: upgrade bundles/rebase.hg to support test-rebase-collapse · 624e5ce615ec
      Nicolas Dumazet authored
      Add two changesets to the scenario so that the bundle can be reused
      within three tests.
      
      Before:
        @  5: 'F'
        |
        | o  4: 'E'
        |/|
        o |  3: 'D
        | |
        | o  2: 'C'
        |/
        | o  1: 'B'
        |/
        o  0: 'A'
      
      After:
        @  7: 'H'
        |
        | o  6: 'G'
        |/|
        o |  5: 'F'
        | |
        | o  4: 'E'
        |/
        | o  3: 'D'
        | |
        | o  2: 'C'
        | |
        | o  1: 'B'
        |/
        o  0: 'A'
      
      Revisions 0-1 keep the same number/label. Others were translated by
      an offset of 2 (2.C -> 4.E)
      624e5ce615ec
  3. Mar 15, 2011
    • Radomir Dopieralski's avatar
      rebase: add -m/--message to rebase --collapse (issue2389) · ee349e228835
      Radomir Dopieralski authored
      When collapsing changesets with rebase, you get a chance to edit the commit
      message manually, but there is no way to pass this message from the command
      line. This patch adds a `--message` (with short form `-m`) and `--logfile`
      (with short form `-m`) options to the rebase command. These options suppresses
      the generation of the default commit message, and instead use the message
      provided in the option (in case of `-m`) or in the file it points to (in case
      of `-l`).
      
      If you use this option without the `--collapse` option, it will raise an
      error.
      
      Options documentation edited by Patrick Mezard <pmezard@gmail.com>
      ee349e228835
  4. Oct 09, 2010
  5. Oct 01, 2010
  6. May 21, 2010
  7. May 20, 2010
  8. Mar 23, 2010
  9. Nov 09, 2009
    • Christian Boos's avatar
      rebase: make sure the newancestor is used during the whole update · 49efeed49c94
      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.
      49efeed49c94
  10. Apr 26, 2009
  11. Sep 16, 2008
  12. Aug 20, 2008
  13. Aug 18, 2008
Loading