Opened 14 years ago

Closed 14 years ago

#466 closed defect (fixed)

-b is actually not an option for hg_sage.merge()

Reported by: pdehaye Owned by: pdehaye
Priority: minor Milestone: sage-2.8.3
Component: user interface Keywords:
Cc: Merged in:
Authors: Reviewers:
Report Upstream: Work issues:
Branch: Commit:
Dependencies: Stopgaps:

Status badges

Description

sage: hg_sage.merge? Type: instancemethod Base Class: <type 'instancemethod'> String Form: <bound method HG.merge of Hg repository 'SAGE Library Source Code' in directory /Library/sage/devel/sage> Namespace: Interactive File: /Library/sage/local/lib/python2.5/site-packages/sage/misc/hg.py Definition: hg_sage.merge(self, options=) Docstring:

Merge working directory with another revision

Merge the contents of the current working directory and the requested revision. Files that changed between either parent are marked as changed for the next commit and a commit must be performed before any further updates are allowed.

INPUT:

options -- default:

'tip' -- tip

-b --branch merge with head of a specific branch -f --force force a merge with outstanding changes

contradicted by

sage: hg_sage.merge(options="--branch main") cd "/Library/sage/devel/sage" && hg merge --branch main hg merge: option --branch not recognized hg merge [-f] [[-r] REV]

merge working directory with another revision

Merge the contents of the current working directory and the requested revision. Files that changed between either parent are marked as changed for the next commit and a commit must be performed before any further updates are allowed.

If no revision is specified, the working directory's parent is a head revision, and the repository contains exactly one other head, the other head is merged with by default. Otherwise, an explicit revision to merge with must be provided.

options:

-f --force force a merge with outstanding changes -r --rev revision to merge

use "hg -v help merge" to show global options

Attachments (1)

5825.patch (4.4 KB) - added by pdehaye 14 years ago.

Download all attachments as: .zip

Change History (6)

comment:1 Changed 14 years ago by pdehaye

That would be

sage: hg_sage.merge?
Type:           instancemethod
Base Class:     <type 'instancemethod'>
String Form:    <bound method HG.merge of Hg repository 'SAGE Library Source Code' in directory /Library/sage/devel/sage>
Namespace:      Interactive
File:           /Library/sage/local/lib/python2.5/site-packages/sage/misc/hg.py
Definition:     hg_sage.merge(self, options='')
Docstring:
    
            Merge working directory with another revision
            
            Merge the contents of the current working directory and the
            requested revision. Files that changed between either parent are
            marked as changed for the next commit and a commit must be
            performed before any further updates are allowed.
    
            INPUT:
                options -- default: ''
                    'tip' -- tip
                     -b --branch  merge with head of a specific branch
                     -f --force   force a merge with outstanding changes
            

sage: hg_sage.merge(options="--branch main")
cd "/Library/sage/devel/sage" && hg merge --branch main
hg merge: option --branch not recognized
hg merge [-f] [[-r] REV]

merge working directory with another revision

    Merge the contents of the current working directory and the
    requested revision. Files that changed between either parent are
    marked as changed for the next commit and a commit must be
    performed before any further updates are allowed.

    If no revision is specified, the working directory's parent is a
    head revision, and the repository contains exactly one other head,
    the other head is merged with by default.  Otherwise, an explicit
    revision to merge with must be provided.

options:

 -f --force  force a merge with outstanding changes
 -r --rev    revision to merge

use "hg -v help merge" to show global options

Changed 14 years ago by pdehaye

comment:2 Changed 14 years ago by pdehaye

  • Owner changed from was to pdehaye
  • Status changed from new to assigned

the file attached should fix the bug

comment:3 Changed 14 years ago by pdehaye

  • Milestone set to sage-2.8.3

comment:4 Changed 14 years ago by was

Applied for sage-2.8.3

comment:5 Changed 14 years ago by was

  • Resolution set to fixed
  • Status changed from assigned to closed
Note: See TracTickets for help on using tickets.