Skip to content
Snippets Groups Projects
  1. Jul 20, 2010
  2. Oct 16, 2010
  3. Oct 17, 2010
  4. Oct 16, 2010
  5. Oct 12, 2010
  6. Oct 16, 2010
  7. Oct 15, 2010
  8. Oct 14, 2010
  9. Oct 13, 2010
  10. Oct 14, 2010
  11. Oct 13, 2010
  12. Sep 10, 2010
    • Gilles Moris's avatar
      backout: provide linear backout as a default (without --merge option) · 52971985
      Gilles Moris authored
      This changes backouts changeset to retain linear history, .e. it is committed
      as a child of the working directory parent, not the reverted changeset
      parent.
      
      The default behavior was previously to just commit a reverted change as a
      child of the backed out changeset - thus creating a new head. Most of
      the time, you would use the --merge option, as it does not make sense to
      keep this dangling head as is.
      The previous behavior could be obtained by using 'hg update --clean .' after a
      'hg backout --merge'.
      
      The --merge option itself is not affected by this change. There is also
      still an autocommit of the backout if a merge is not needed, i.e. in case
      the backout is the parent of the working directory.
      
      Previously we had (pwd = parent of the working directory):
                        pwd     older
      backout           auto    merge
      backout --merge   auto    commit
      
      With the new linear approach:
                        pwd     older
      backout           auto    commit
      backout --merge   auto    commit
      
      auto: commit done by the backout command
      merge: backout also already committed but explicit merge and commit needed
      commit: user need to commit the update/merge
      52971985
  13. Oct 11, 2010
  14. Oct 12, 2010
  15. Oct 02, 2010
  16. Oct 12, 2010
  17. Oct 01, 2010
    • Brodie Rao's avatar
      convert/darcs: support changelogs with bytes 0x7F-0xFF (issue2411) · 89df79b3
      Brodie Rao authored
      This is a followup to 4481f8a93c7a, which only fixed the conversion of
      patches with UTF-8 metadata.
      
      This patch allows a changelog to have any bytes with values
      0x7F-0xFF. It parses the XML changelog as Latin-1 and uses
      converter_source.recode() to decode the data as UTF-8/Latin-1.
      
      Caveats:
      
      - Since the convert extension doesn't provide any way to specify the
        source encoding, users are still limited to UTF-8 and Latin-1.
      
      - etree will still complain if the changelog has bytes with values
        0x00-0x19. XML only allows printable characters.
      89df79b3
  18. Oct 11, 2010
  19. Oct 10, 2010
  20. Oct 11, 2010
  21. Oct 10, 2010
  22. Jul 27, 2010
    • Nicolas Dumazet's avatar
      filectx: use ctx.size comparisons to speed up ctx.cmp · 4147a292
      Nicolas Dumazet authored
      Comparing sizes is cheaper than comparing file contents, as it does not
      involve reading the file on disk or from the filelog.
      
      It is however not always possible: some extensions, or encode filters,
      change data when extracting it to the working directory.
      4147a292
  23. Oct 10, 2010
  24. Oct 11, 2010
Loading