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

rebase: skip obsolete commits even if they have pruned successors...

rebase: skip obsolete commits even if they have pruned successors Issue 5782 reported that `hg rebase -r <obsolete commit with pruned successor>` failed with an error saying that it would cause divergence. Commit (rebase: do not consider extincts for divergence detection (issue5782), 2018-02-09) fixed it by letting you rebase the commit. However, that fix seems inconsistent with how we handle `hg rebase -r <pruned commit>`. To me, it should make no difference whether a commit is pruned itself or if it has (only) pruned successors. This patch changes it so we treat these two kinds of commits the same way. I let the message we print remain "note: not rebasing <commit>, it has no successor" even though that last part is not technically correct for commits with pruned successors. I doubt it will confuse users. Differential Revision: https://phab.mercurial-scm.org/D10240

Gregory Szorc - - Load All Authors

File last commit:

r38032:e5d2248d default


                r47559:32399d08

default

Download file

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

        Gregory Szorc
    
packaging: move contrib/macosx to contrib/packaging/...

              r38032
            
      <?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

Gregory Szorc packaging: move contrib/macosx to contrib/packaging/...	r38032	<?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>