Sisyphus repository
Last update: 1 october 2023 | SRPMs: 18631 | Visits: 37039950
en ru br
ALT Linux repos
S:0.1.6734.fbd3f-alt1

Group :: Text tools
RPM: git-merge-changelog

 Main   Changelog   Spec   Patches   Sources   Download   Gear   Bugs and FR  Repocop 

Current version: 0.1.6734.fbd3f-alt1
Build date: 2 february 2019, 22:42 ( 268.7 weeks ago )
Size: 8217 b

Home page:   https://www.gnu.org/software/gnulib/

License: GPLv2+
Summary: git merge driver for GNU style ChangeLog files
Description:

The default merge driver of 'git' *always* produces conflicts when
pulling public modifications into a privately modified ChangeLog file.
This is because ChangeLog files are always modified at the top; the
default merge driver has no clue how to deal with this. Furthermore
the conflicts are presented with more <<<< ==== >>>> markers than
necessary; this is because the default merge driver makes pointless
efforts to look at the individual line changes inside a ChangeLog entry.

git-merge-changelog program serves as a 'git' merge driver that avoids
these problems.
1. It produces no conflict when ChangeLog entries have been inserted
  at the top both in the public and in the private modification. It
  puts the privately added entries above the publicly added entries.
2. It respects the structure of ChangeLog files: entries are not split
  into lines but kept together.
3. It also handles the case of small modifications of past ChangeLog
  entries, or of removed ChangeLog entries: they are merged as one
  would expect it.
4. Conflicts are presented at the top of the file, rather than where
  they occurred, so that the user will see them immediately. (Unlike
  for source code written in some programming language, conflict markers
  that are located several hundreds lines from the top will not cause
  any syntax error and therefore would be likely to remain unnoticed.)

Current maintainer: Dmitry V. Levin

List of contributors

List of rpms provided by this srpm:

  • git-merge-changelog
  • git-merge-changelog-debuginfo
ACL:
     
    design & coding: Vladimir Lettiev aka crux © 2004-2005, Andrew Avramenko aka liks © 2007-2008
    current maintainer: Michael Shigorin