1. 04 Nov, 2013 1 commit
  2. 31 Oct, 2013 4 commits
  3. 19 Aug, 2013 2 commits
  4. 15 Aug, 2013 6 commits
  5. 19 Jul, 2013 1 commit
    • Mike Miller's avatar
      Rebase man page patches on changes accepted upstream · a47e69c9
      Mike Miller authored
      Refresh and rename patches fixing man page lintian tags
      manpage-has-bad-whatis-entry and hyphen-used-as-minus-sign from upstream
      git.
      
      Apply third patch from upstream to fix lintian tag
      binary-without-manpage.
      a47e69c9
  6. 13 Jan, 2013 1 commit
  7. 12 Jan, 2013 7 commits
  8. 10 Aug, 2011 4 commits
  9. 03 Aug, 2011 1 commit
  10. 25 Jul, 2011 3 commits
  11. 12 Jul, 2011 1 commit
  12. 07 Jul, 2011 2 commits
  13. 06 Jul, 2011 1 commit
  14. 29 Jun, 2011 1 commit
  15. 25 Jun, 2011 1 commit
  16. 24 Jun, 2011 1 commit
  17. 22 Jun, 2011 1 commit
  18. 17 Jun, 2011 2 commits
    • Raman Gupta's avatar
    • Raman Gupta's avatar
      Support meld as well as vimdiff for merging · 054edb5a
      Raman Gupta authored
      When using meld, the left side has the "other file" i.e. the file with
      the .rpmnew or .rpmsave extension. The right side has the "final file"
      i.e. the target file into which changes have to be merged.
      
      If the rpm action was to save the existing conf file, then the left side
      will be the original conf file (.rpmsave) and the right side will be the
      new rpm-based configuration. The user should merge any changes they want
      to keep from their old .rpmsave from left to right.
      
      If the rpm action was to keep the existing conf file, then the left side
      will be the new conf file (.rpmnew) and right side will be the current
      local configuration. The user should merge any changes in the new rpm
      file into their local config from left to right.
      
      Ideally these operations would be 3-way diffs between the local file and
      the new rpm config, using the original rpm config as the common merge base.
      However, the original rpm config is not available to yum and therefore a
      3-way diff is not possible. Perhaps a future enhancement would be to use a
      .orig file, if present, as the merge base for meld.
      
      When using vimdiff, the order has not changed. The first parameter to
      vimdiff is the "final: file i.e. the target file, and the second parameter
      is the "other" file i.e. the .rpmnew or .rpmsave file.
      054edb5a