contrib/plan9/hgrc.d/9diff.rc
author Denis Laxalde <denis.laxalde@logilab.fr>
Fri, 25 Oct 2019 14:02:40 +0200
branchstable
changeset 43332 8fda98a68427
parent 19617 ba89c3872801
permissions -rw-r--r--
packaging: remove version info from Breaks+Replaces in Debian package The versioned Breaks: and Replaces: cause problem when trying to install our package over the one in Debian. $ sudo apt install ./packages/debian-buster/mercurial_5.2~rc0+15-buster-a2ff3aff81d2_amd64.deb Reading package lists... Done Building dependency tree Reading state information... Done Note, selecting 'mercurial' instead of './packages/debian-buster/mercurial_5.2~rc0+15-buster-a2ff3aff81d2_amd64.deb' Some packages could not be installed. This may mean that you have requested an impossible situation or if you are using the unstable distribution that some required packages have not yet been created or been moved out of Incoming. The following information may help to resolve the situation: The following packages have unmet dependencies: mercurial : Breaks: mercurial-common (< 5.2~rc0+15-buster-a2ff3aff81d2) but 5.2~rc0-1 is to be installed E: Unable to correct problems, you have held broken packages. Removing version information resolves the situation.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
16442
9181188ffb5b plan9: finalize documentation for next release
Steven Stallion <sstallion@gmail.com>
parents: 16383
diff changeset
     1
# The 9diff extdiff command generates diff(1) compatible output
9181188ffb5b plan9: finalize documentation for next release
Steven Stallion <sstallion@gmail.com>
parents: 16383
diff changeset
     2
# suitable for use with the plumber(4).
16383
f5dd179bfa4a plan9: initial support for plan 9 from bell labs
Steven Stallion <sstallion@gmail.com>
parents:
diff changeset
     3
[extensions]
f5dd179bfa4a plan9: initial support for plan 9 from bell labs
Steven Stallion <sstallion@gmail.com>
parents:
diff changeset
     4
extdiff =
f5dd179bfa4a plan9: initial support for plan 9 from bell labs
Steven Stallion <sstallion@gmail.com>
parents:
diff changeset
     5
f5dd179bfa4a plan9: initial support for plan 9 from bell labs
Steven Stallion <sstallion@gmail.com>
parents:
diff changeset
     6
[extdiff]
19617
ba89c3872801 hgrc.d: separate namespace for mercurial scripts 9diff and 9mail
Jeff Sickel <jas@corpus-callosum.com>
parents: 16442
diff changeset
     7
9diff = /bin/mercurial/9diff -cm $parent $child $root