upstream/mercurial-mirror Files · tests/histedit-helpers.sh

changectx: ancestor should only prefer merge.preferancestor if it is a revision...

changectx: ancestor should only prefer merge.preferancestor if it is a revision The value '*' currently designates that bid merge should be used. The best way to test bid merge is to set preferancestor=* in the configuration file ... but then it would abort with unknown revision '*' when other code paths ended up in changectx.ancestor . Instead, just skip and ignore the value '*' when looking for a preferred ancestor.

Mads Kiilerich - - Load All Authors

File last commit:

r17085:35729bdd default


                r22180:17011b36

stable

Download file

             histedit-helpers.sh
        
                    6 lines
            
             | 217 B
            
                | application/x-sh
            
             |
                BashLexer
            
             / tests / histedit-helpers.sh
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      fixbundle() {

          grep -v 'saving bundle' | grep -v 'saved backup' | \

              grep -v added | grep -v adding | \

              grep -v "unable to find 'e' for patching" | \

              grep -v "e: No such file or directory"

      }

	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

				fixbundle() {
				grep -v 'saving bundle' \| grep -v 'saved backup' \| \
				grep -v added \| grep -v adding \| \
				grep -v "unable to find 'e' for patching" \| \
				grep -v "e: No such file or directory"
				}