svn commit: r39417 - head/en_US.ISO8859-1/articles/committers-guide

[Doug Barton]

It's great that we're giving people more examples, just a few thoughts ...

On 08/22/2012 07:55, Niclas Zeising wrote:

> +	    <title>Practical Example</title>
> +	    <para>As an practical example, consider the following scenario:
> +	      The changes to <filename>netmap.4</filename> in r238987 is
> +	      to be merged from CURRENT to 9-STABLE.  The file resides in
> +	      <filename class="directory">head/share/man/man4</filename> and
> +	      according to <xref linkend="subversion-primer-merge"> this
> +	      is also where to do the merge.  Note that in this example
> +	      all paths are relative to the top of the svn repository.
> +	      for more information on the directory layout, see
> +	      <xref linkend="subversion-primer-base-layout">.</para>
> +            <para>The first step is to check the existing mergeinfo.</para>

Silly question, why? :) And if we're going to suggest this, we need to
tell the user what they are looking for.

Generally I find it's not necessary to inspect it first, see below.

> +	    <screen>&prompt.user; <userinput>svn merge -c r238987 svn+ssh://svn.freebsd.org/base/head/share/man/man4 stable/9/share/man/man4</userinput>

First, I recommend cd'ing to the directory where the merge is to occur
before doing anything else. Something like:

cd stable/9/share/man/man4
svn up
svn stat

to make sure that you are up to date, and then run the merge. Also FYI,
I'm pretty sure that 'merge -c' will choke on the r you have in the
revision number there. My mfc function strips it, but I don't remember
if that was for aesthetics, or because I got an error when I did it.

> +--- Merging r238987 into 'stable/9/share/man/man4':
> +U    stable/9/share/man/man4/netmap.4
> +--- Recording mergeinfo for merge of r238987 into
> +'stable/9/share/man/man4':
> + U   stable/9/share/man/man4</screen>
> +
> +	    <para>Check that the merge info is still ok; the revision
> +	      number of the merged revision should be added.  Once this
> +	      is checked, the only thing left is the actual commit.</para>

At this point I always do 'svn diff' to make sure that the change came
through the way I expected it to. You will also see the mergeinfo diff
here, even though it doesn't show up in the commit mail.

hope this helps,

Doug

> +            <screen>&prompt.user; <userinput>svn commit stable/9/share/man/man4</userinput></screen>

If you are in the directory this can be simplified to 'svn ci'

hth,

Doug

-- 

    I am only one, but I am one.  I cannot do everything, but I can do
    something.  And I will not let what I cannot do interfere with what
    I can do.
			-- Edward Everett Hale, (1822 - 1909)