upstream/mercurial-mirror Files · contrib/packaging/macosx/distribution.xml

graft: always allow hg graft --base . (issue6248)...

graft: always allow hg graft --base . (issue6248) `hg graft --base . -r abc` is rejected before this change with a "nothing to merge" error, if `abc` does not descend from `.`. This looks like an artifact of the implementation rather than intended behavior. It makes perfect sense to apply the diff between `.` and `abc` to the working copy (i.e. degenerate into `hg revert`), regardless of what `abc` is. Differential Revision: https://phab.mercurial-scm.org/D8127

Gregory Szorc - - Load All Authors

File last commit:

r38032:e5d2248d default


                r44867:218feb1a

default

Download file

             distribution.xml
        
                    19 lines
            
             | 805 B
            
                | application/xml
            
             |
                XmlLexer
            
             / contrib / packaging / macosx / distribution.xml
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      <?xml version="1.0" encoding="utf-8" standalone="no"?>

      <installer-gui-script minSpecVersion="1">

        <title>Mercurial SCM</title>

        <organization>org.mercurial-scm</organization>

        <options customize="never" require-scripts="false" rootVolumeOnly="true" />

        <welcome file="Welcome.html" mime-type="text/html" />

        <license file="../../../COPYING" mime-type="text/plain" />

        <readme file="Readme.html" mime-type="text/html" />

        <pkg-ref id="org.mercurial-scm.mercurial"

                 version="0"

                 auth="root"

                 onConclusion="none">mercurial.pkg</pkg-ref>

        <choices-outline>

          <line choice="org.mercurial-scm.mercurial"/>

        </choices-outline>

        <choice id="org.mercurial-scm.mercurial" visible="false">

          <pkg-ref id="org.mercurial-scm.mercurial"/>

        </choice>

      </installer-gui-script>

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

				<?xml version="1.0" encoding="utf-8" standalone="no"?>
				<installer-gui-script minSpecVersion="1">
				<title>Mercurial SCM</title>
				<organization>org.mercurial-scm</organization>
				<options customize="never" require-scripts="false" rootVolumeOnly="true" />
				<welcome file="Welcome.html" mime-type="text/html" />
				<license file="../../../COPYING" mime-type="text/plain" />
				<readme file="Readme.html" mime-type="text/html" />
				<pkg-ref id="org.mercurial-scm.mercurial"
				version="0"
				auth="root"
				onConclusion="none">mercurial.pkg</pkg-ref>
				<choices-outline>
				<line choice="org.mercurial-scm.mercurial"/>
				</choices-outline>
				<choice id="org.mercurial-scm.mercurial" visible="false">
				<pkg-ref id="org.mercurial-scm.mercurial"/>
				</choice>
				</installer-gui-script>