Patchwork merge: Be precise about what merged into what in short desc

login
register
mail settings
Submitter anatoly techtonik
Date Nov. 26, 2014, 2:22 p.m.
Message ID <ef7bd889ba988435ce87.1417011753@BlackBox>
Download mbox | patch
Permalink /patch/6865/
State Accepted
Commit 3bd577a3283ee09cc0bfcedbec4e5ca241c837f7
Headers show

Comments

anatoly techtonik - Nov. 26, 2014, 2:22 p.m.
# HG changeset patch
# User anatoly techtonik <techtonik@gmail.com>
# Date 1417011729 -10800
#      Wed Nov 26 17:22:09 2014 +0300
# Branch stable
# Node ID ef7bd889ba988435ce87fceb9a1bb72c46a97e9b
# Parent  6dfb78f18bdba03067c7060cbe5b4ca2e757dde9
merge: Be precise about what merged into what in short desc
Matt Mackall - Nov. 26, 2014, 7:50 p.m.
On Wed, 2014-11-26 at 17:22 +0300, anatoly techtonik wrote:
> # HG changeset patch
> # User anatoly techtonik <techtonik@gmail.com>
> # Date 1417011729 -10800
> #      Wed Nov 26 17:22:09 2014 +0300
> # Branch stable
> # Node ID ef7bd889ba988435ce87fceb9a1bb72c46a97e9b
> # Parent  6dfb78f18bdba03067c7060cbe5b4ca2e757dde9
> merge: Be precise about what merged into what in short desc

Queued for stable, thanks. Caps fixed in flight.
anatoly techtonik - Nov. 26, 2014, 8:09 p.m.
On Wed, Nov 26, 2014 at 10:50 PM, Matt Mackall <mpm@selenic.com> wrote:
> On Wed, 2014-11-26 at 17:22 +0300, anatoly techtonik wrote:
>> # HG changeset patch
>> # User anatoly techtonik <techtonik@gmail.com>
>> # Date 1417011729 -10800
>> #      Wed Nov 26 17:22:09 2014 +0300
>> # Branch stable
>> # Node ID ef7bd889ba988435ce87fceb9a1bb72c46a97e9b
>> # Parent  6dfb78f18bdba03067c7060cbe5b4ca2e757dde9
>> merge: Be precise about what merged into what in short desc
>
> Queued for stable, thanks. Caps fixed in flight.

Sorry for caps - too many projects and conventions to remember and too
little time to reread the docs. This requirement from
http://mercurial.selenic.com/wiki/ContributingChanges is quite easy to
check with script, but that doesn't work for emailing changes and for
cloned repositories. What is the best practice to preserve project
safety harness while cloning?
Pierre-Yves David - Nov. 26, 2014, 8:23 p.m.
On 11/26/2014 12:09 PM, anatoly techtonik wrote:
> On Wed, Nov 26, 2014 at 10:50 PM, Matt Mackall <mpm@selenic.com> wrote:
>> On Wed, 2014-11-26 at 17:22 +0300, anatoly techtonik wrote:
>>> # HG changeset patch
>>> # User anatoly techtonik <techtonik@gmail.com>
>>> # Date 1417011729 -10800
>>> #      Wed Nov 26 17:22:09 2014 +0300
>>> # Branch stable
>>> # Node ID ef7bd889ba988435ce87fceb9a1bb72c46a97e9b
>>> # Parent  6dfb78f18bdba03067c7060cbe5b4ca2e757dde9
>>> merge: Be precise about what merged into what in short desc
>>
>> Queued for stable, thanks. Caps fixed in flight.
>
> Sorry for caps - too many projects and conventions to remember and too
> little time to reread the docs. This requirement from
> http://mercurial.selenic.com/wiki/ContributingChanges is quite easy to
> check with script, but that doesn't work for emailing changes and for
> cloned repositories. What is the best practice to preserve project
> safety harness while cloning?

The test-check-*.t series of test will validate the Mercurial code 
style. One of them check for commit message too.
Matt Mackall - Nov. 27, 2014, 6:17 p.m.
On Wed, 2014-11-26 at 13:50 -0600, Matt Mackall wrote:
> On Wed, 2014-11-26 at 17:22 +0300, anatoly techtonik wrote:
> > # HG changeset patch
> > # User anatoly techtonik <techtonik@gmail.com>
> > # Date 1417011729 -10800
> > #      Wed Nov 26 17:22:09 2014 +0300
> > # Branch stable
> > # Node ID ef7bd889ba988435ce87fceb9a1bb72c46a97e9b
> > # Parent  6dfb78f18bdba03067c7060cbe5b4ca2e757dde9
> > merge: Be precise about what merged into what in short desc
> 
> Queued for stable, thanks. Caps fixed in flight.

Also, the test suite sends many warm season's greetings.

Patch

diff -r 6dfb78f18bdb -r ef7bd889ba98 mercurial/commands.py
--- a/mercurial/commands.py	Sat Jul 26 09:27:11 2014 +0300
+++ b/mercurial/commands.py	Wed Nov 26 17:22:09 2014 +0300
@@ -4261,7 +4261,7 @@ 
      ] + mergetoolopts,
     _('[-P] [-f] [[-r] REV]'))
 def merge(ui, repo, node=None, **opts):
-    """merge working directory with another revision
+    """merge another revision into working directory
 
     The current working directory is updated with all changes made in
     the requested revision since the last common predecessor revision.