git-merge-changelog-0.1.1213.683b6-alt1.x86_64.rpm


Advertisement

Description

git-merge-changelog - git merge driver for GNU style ChangeLog files

Property Value
Distribution ALT Linux Sisyphus
Repository Classic x86_64
Package name git-merge-changelog
Package version 0.1.1213.683b6
Package release alt1
Package architecture x86_64
Package type rpm
Installed size 62.32 KB
Download size 62.32 KB
Official Mirror ftp.altlinux.org
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.)

Alternatives

Package Version Architecture Repository
git-merge-changelog-0.1.1213.683b6-alt1.i586.rpm 0.1.1213.683b6 i586 Classic
git-merge-changelog - - -

Requires

Name Value
/lib64/ld-linux-x86-64.so.2 -
libc.so.6(GLIBC_2.14)(64bit) -
libc.so.6(GLIBC_2.2.5)(64bit) -
libc.so.6(GLIBC_2.3.4)(64bit) -
libc.so.6(GLIBC_2.4)(64bit) -
rpmlib(PayloadIsLzma) -
rtld(GNU_HASH) -

Provides

Name Value
git-merge-changelog = 0.1.1213.683b6-alt1

Download

Type URL
Binary Package git-merge-changelog-0.1.1213.683b6-alt1.x86_64.rpm
Source Package git-merge-changelog-0.1.1213.683b6-alt1.src.rpm

Install Howto

  1. Add the following line to /etc/apt/sources.list:
    
    rpm [Sisyphus] http://ftp.altlinux.org/pub/distributions/ALTLinux/Sisyphus x86_64 classic
    rpm [Sisyphus] http://ftp.altlinux.org/pub/distributions/ALTLinux/Sisyphus noarch classic
    
  2. Update the package index:
    # sudo apt-get update
  3. Install git-merge-changelog rpm package:
    # sudo apt-get install git-merge-changelog

Files

Path
/usr/bin/git-merge-changelog

Changelog

2017-08-10 - Aleksei Nikiforov <darktemplar@altlinux.org> 0.1.1213.683b6-alt1
- Rebuilt with gnulib snapshot v0.1-1213-g683b607.
2017-03-20 - Dmitry V. Levin <ldv@altlinux.org> 0.1.1209.24b32-alt1
- Rebuilt with gnulib snapshot v0.1-1209-g24b3216.
2015-10-06 - Dmitry V. Levin <ldv@altlinux.org> 0.1.585.2fda85-alt1
- Rebuilt with gnulib snapshot v0.1-585-g2fda85e.
2015-05-25 - Dmitry V. Levin <ldv@altlinux.org> 0.1.443.875ec93-alt1
- Rebuilt with gnulib snapshot v0.1-443-g875ec93.
2014-02-21 - Dmitry V. Levin <ldv@altlinux.org> 0.1.114.caf1b31-alt2
- Enabled test suite.
2014-02-19 - Dmitry V. Levin <ldv@altlinux.org> 0.1.114.caf1b31-alt1
- Rebuilt with gnulib snapshot v0.1-114-gcaf1b31.
2014-01-04 - Dmitry V. Levin <ldv@altlinux.org> 0.1.58.0f3a662-alt1
- Rebuilt with gnulib snapshot v0.1-58-g0f3a662.
2013-10-28 - Dmitry V. Levin <ldv@altlinux.org> 0.0.8061.5191b35-alt1
- Rebuilt with gnulib snapshot v0.0-8061-g5191b35.
2013-04-12 - Dmitry V. Levin <ldv@altlinux.org> 0.0.7902.92f3a4c-alt1
- Rebuilt with gnulib snapshot v0.0-7902-g92f3a4c.
2013-04-07 - Dmitry V. Levin <ldv@altlinux.org> 0.0.7901.076ac82-alt1
- Rebuilt with gnulib snapshot v0.0-7901-g076ac82.

See Also

Package Description
git-server-2.17.2-alt1.x86_64.rpm Simple TCP git server for git repositories
git-svn-2.17.2-alt1.x86_64.rpm Git tools for importing Subversion repositories
gitg-3.30.0-alt1.x86_64.rpm git repository viewer targeting gtk+/GNOME
gkermit-1.00-alt1.qa1.x86_64.rpm Transfer files with the Kermit protocol
gkrellm-2.3.10-alt1.1.x86_64.rpm Multiple stacked system monitors
gkrellm-aclock-0.3.2-alt3.qa1.x86_64.rpm GKrellM aclock plugin
gkrellm-alltraxclock2-0.2-alt1.x86_64.rpm GKrellM analog clock plugin
gkrellm-bluez-0.2-alt2.qa2.x86_64.rpm GKrellm plugin monitoring Linux BlueZ adapters
gkrellm-countdown-0.1.2-alt1.qa1.x86_64.rpm GKrellM plugin which provides a simple countdown clock
gkrellm-devel-2.3.10-alt1.1.x86_64.rpm Gkrellm include files
gkrellm-gkrelldnet-0.14.2-alt1.1.x86_64.rpm GKrellM monitor for Distributed.net client
gkrellm-gkrellmpc-0.1_beta10-alt4.qa1.x86_64.rpm GKrellM plugin to control Music Player Daemon
gkrellm-gkrelltop-2.2.13-alt1.qa1.x86_64.rpm GKrellM plugin which shows 3 most cpu intensive processes
gkrellm-gtodo-0.2.4-alt1.x86_64.rpm GKrellM gtodo plugin
gkrellm-ibam-0.5.2-alt3.x86_64.rpm GKrellM Intelligent Battery Monitor (IBaM) plugin
Advertisement
Advertisement