1. 10 Aug, 2011 4 commits
  2. 03 Aug, 2011 1 commit
  3. 25 Jul, 2011 3 commits
  4. 12 Jul, 2011 1 commit
  5. 07 Jul, 2011 2 commits
  6. 06 Jul, 2011 1 commit
  7. 29 Jun, 2011 1 commit
  8. 25 Jun, 2011 1 commit
  9. 24 Jun, 2011 1 commit
  10. 22 Jun, 2011 1 commit
  11. 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
  12. 10 Jun, 2011 4 commits
  13. 01 Jun, 2011 1 commit
  14. 20 May, 2011 2 commits
  15. 18 May, 2011 1 commit
  16. 17 May, 2011 1 commit
    • Seth Vidal's avatar
      - fix rh bug: #705179 · 335a4754
      Seth Vidal authored
          - fix fmt_queryformat not being happy with new 'output' formats passed
            everywhere else.
      335a4754
  17. 26 Apr, 2011 3 commits
  18. 24 Apr, 2011 4 commits
  19. 06 Apr, 2011 2 commits
  20. 30 Mar, 2011 3 commits
  21. 29 Mar, 2011 1 commit