(no subject)

[Mark Wielaard]

Since I had to look things up and didn't get the setup correct
the first try I thought it would be good to include specific
instructions on how to use git-merge-changelog with Mercurial hg.

[Mark Wielaard]

        * lib/git-merge-changelog.c: Add example on how to use in .hgrc.
---
 ChangeLog                 |    5 +++++
 lib/git-merge-changelog.c |   10 +++++++++-
 2 files changed, 14 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e600a1d..9650fc3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
[phone]  Mark Wielaard  <mark@...>
+
+ git-merge-changelog: add specific example on how to use with hg.
+ * lib/git-merge-changelog.c: Add example on how to use in .hgrc.
+
 2012-03-15  Bruno Haible  <bruno@...>
 
  fmal: Avoid test failure on OpenBSD 5.1/SPARC64.
diff --git a/lib/git-merge-changelog.c b/lib/git-merge-changelog.c
index 500f55b..1c34364 100644
--- a/lib/git-merge-changelog.c
+++ b/lib/git-merge-changelog.c
@@ -75,7 +75,15 @@
           $ bzr extmerge ChangeLog
 
    Additionally, for hg users:
-     - Add to your $HOME/.hgrc a couple of lines in a section [merge-tools].
+     - Add to your $HOME/.hgrc the lines
+
+        [merge-patterns]
+        ChangeLog = git-merge-changelog
+
+        [merge-tools]
+        git-merge-changelog.executable = /usr/local/bin/git-merge-changelog
+        git-merge-changelog.args = $base $local $other
+
        See <http://www.selenic.com/mercurial/hgrc.5.html> section merge-tools
        for reference.
  */
--
1.7.7.6

[eblake]

On 03/16/2012 12:08 PM, Mark Wielaard wrote:

> * lib/git-merge-changelog.c: Add example on how to use in .hgrc.
> ---
>  ChangeLog                 |    5 +++++
>  lib/git-merge-changelog.c |   10 +++++++++-
>  2 files changed, 14 insertions(+), 1 deletions(-)
>
> diff --git a/ChangeLog b/ChangeLog
> index e600a1d..9650fc3 100644
> --- a/ChangeLog
> +++ b/ChangeLog
> @@ -1,3 +1,8 @@
> [phone]  Mark Wielaard  <mark@...>
> +
> + git-merge-changelog: add specific example on how to use with hg.
> + * lib/git-merge-changelog.c: Add example on how to use in .hgrc.

Thanks; pushed.

--
Eric Blake   eblake@...    [phone]
Libvirt virtualization library http://libvirt.org