Skip to content
Snippets Groups Projects
  1. Nov 16, 2011
  2. Nov 15, 2011
  3. Nov 10, 2011
  4. Nov 08, 2011
  5. Nov 10, 2011
  6. Nov 09, 2011
  7. Nov 06, 2011
  8. Nov 08, 2011
  9. Nov 10, 2011
    • Nicolas Venegas's avatar
      mdiff/patch: fix bad hunk handling for unified diffs with zero context · 2b1ec74c961f
      Nicolas Venegas authored
      Prior to this patch "hg diff -U0", i.e., zero lines of context, would
      output hunk headers with a start line one greater than what GNU patch
      and git output. Guido van Rossum documents the unified diff format[1]
      as having a start line value "one lower than one would expect" for
      zero length hunks.
      
      Comparing the behaviour of the three systems prior to this patch in
      transforming
      
        c1
        c3
      
      to
      
        c1
        c2
        c3
      
      - GNU "diff -U0" reports the hunk as "@@ -1,0 +2 @@"
      - "git diff -U0" reports the hunk as "@@ -1,0 +2 @@"
      - "hg diff -U0" reports the hunk as "@@ -2,0 +2,1 @@"
      
      After this patch, "hg diff -U0" reports "@@ -1,0 +2,1 @@".
      
      Since "hg export --config diff.unified=0" outputs zero-context unified
      diffs, "hg import" has also been updated to account for start lines
      one less than expected for zero length hunk ranges.
      
      [1]: http://www.artima.com/weblogs/viewpost.jsp?thread=164293
      2b1ec74c961f
  10. Nov 08, 2011
    • Patrick Mezard's avatar
      convert/bzr: correctly handle divergent nested renames (issue3089) · 6ba2fc0a87ab
      Patrick Mezard authored
      With renames like:
      
        a   -> b
        a/c -> a/c
      
      We were ignoring or duplicating the second one instead of leaving files
      unchanged or moving them to their proper destination only.
      
      To avoid this, we process the files in reverse lexicographic order, from most
      to least specific change, and ignore files already processed.
      
      v2:
      - Add a test
      - Change "reverse=1" into "reverse=True"
      6ba2fc0a87ab
  11. Nov 01, 2011
  12. Jul 23, 2011
  13. Nov 09, 2011
  14. Nov 07, 2011
Loading