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. Feb 24, 2011
  3. Feb 16, 2011
  4. Feb 11, 2011
  5. Oct 09, 2010
  6. Sep 22, 2010
    • Brodie Rao's avatar
      tests: add glob matching for unified tests · 97ffc68f71d3
      Brodie Rao authored
      This adds a " (glob)" marker that works like a simpler version of
      (re): "*" is converted to ".*", and "?" is converted to ".".
      
      Both special characters can be escaped using "\", and the backslash
      itself can be escaped as well.
      
      Other glob-style syntax, like "**", "[chars]", or "[!chars]", isn't
      supported.
      97ffc68f71d3
    • Brodie Rao's avatar
      tests: require regexes in unified tests to be marked with " (re)" · 02990e22150b
      Brodie Rao authored
      Consider this test:
      
        $ hg glog --template '{rev}:{node|short} "{desc}"\n'
        @  2:20c4f79fd7ac "3"
        |
        | o  1:38f24201dcab "2"
        |/
        o  0:2a18120dc1c9 "1"
      
      Because each line beginning with "|" can be compiled as a regular
      expression (equivalent to ".*|"), they will match any output.
      
      Similarly:
      
        $ echo foo
      
      
      The blank output line can be compiled as a regular expression and will
      also match any output.
      
      With this patch, none of the above output lines will be matched as
      regular expressions. A line must end in " (re)" in order to be matched
      as one.
      
      Lines are still matched literally first, so the following will pass:
      
        $ echo 'foo (re)'
        foo (re)
      02990e22150b
  7. Aug 16, 2010
  8. Aug 14, 2010
  9. May 21, 2010
  10. May 20, 2010
  11. Apr 26, 2009
  12. Nov 06, 2008
Loading