upstream/mercurial-mirror Files · tests/test-merge-types.t

revset: add ^ and ~ operators from parentrevspec extension...

revset: add ^ and ~ operators from parentrevspec extension ^ (Nth parent) and ~ (Nth first ancestor) are infix operators that match certain ancestors of the set: set^0 the set set^1 (also available as set^) the first parent of every changeset in set set^2 the second parent of every changeset in set set~0 the set set~1 the first ancestor (i.e. the first parent) of every changeset in set set~2 the second ancestor (i.e. first parent of first parent) of every changeset in set set~N the Nth ancestor (following first parents only) of every changeset in set; set~N is equivalent to set^1^1..., with ^1 repeated N times.

Adrian Buehlmann - - Load All Authors

File last commit:

r12279:28e2e380 default


                r14070:305c9767

default

Download file

             test-merge-types.t
        
                    70 lines
            
             | 1.7 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-merge-types.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Adrian Buehlmann
    
combine tests

              r12279
            
        $ hg init

        $ echo a > a

        $ hg ci -Amadd

        adding a

        $ chmod +x a

        $ hg ci -mexecutable

        $ hg up 0

        0 files updated, 0 files merged, 0 files removed, 0 files unresolved

        $ rm a

        $ ln -s symlink a

        $ hg ci -msymlink

        created new head

        $ hg merge --debug

          searching for copies back to rev 1

        resolving manifests

         overwrite None partial False

         ancestor c334dc3be0da local 521a1e40188f+ remote 3574f3e69b1c

         conflicting flags for a

        (n)one, e(x)ec or sym(l)ink? n

         a: update permissions -> e

        updating: a 1/1 files (100.00%)

        0 files updated, 0 files merged, 0 files removed, 0 files unresolved

        (branch merge, don't forget to commit)

      Symlink is local parent, executable is other:

        $ if [ -h a ]; then

        >     echo a is a symlink

        >     $TESTDIR/readlink.py a

        > elif [ -x a ]; then

        >     echo a is executable

        > else

        >     echo "a has no flags (default for conflicts)"

        > fi

        a has no flags (default for conflicts)

        $ hg update -C 1

        1 files updated, 0 files merged, 0 files removed, 0 files unresolved

        $ hg merge --debug

          searching for copies back to rev 1

        resolving manifests

         overwrite None partial False

         ancestor c334dc3be0da local 3574f3e69b1c+ remote 521a1e40188f

         conflicting flags for a

        (n)one, e(x)ec or sym(l)ink? n

         a: remote is newer -> g

        updating: a 1/1 files (100.00%)

        getting a

        1 files updated, 0 files merged, 0 files removed, 0 files unresolved

        (branch merge, don't forget to commit)

      Symlink is other parent, executable is local:

        $ if [ -h a ]; then

        >    echo a is a symlink

        >    $TESTDIR/readlink.py a

        > elif [ -x a ]; then

        >     echo a is executable

        > else

        >     echo "a has no flags (default for conflicts)"

        > fi

        a has no flags (default for conflicts)

	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

Adrian Buehlmann combine tests	r12279	$ hg init

		$ echo a > a
		$ hg ci -Amadd
		adding a

		$ chmod +x a
		$ hg ci -mexecutable

		$ hg up 0
		0 files updated, 0 files merged, 0 files removed, 0 files unresolved
		$ rm a
		$ ln -s symlink a
		$ hg ci -msymlink
		created new head

		$ hg merge --debug
		searching for copies back to rev 1
		resolving manifests
		overwrite None partial False
		ancestor c334dc3be0da local 521a1e40188f+ remote 3574f3e69b1c
		conflicting flags for a
		(n)one, e(x)ec or sym(l)ink? n
		a: update permissions -> e
		updating: a 1/1 files (100.00%)
		0 files updated, 0 files merged, 0 files removed, 0 files unresolved
		(branch merge, don't forget to commit)


		Symlink is local parent, executable is other:

		$ if [ -h a ]; then
		> echo a is a symlink
		> $TESTDIR/readlink.py a
		> elif [ -x a ]; then
		> echo a is executable
		> else
		> echo "a has no flags (default for conflicts)"
		> fi
		a has no flags (default for conflicts)

		$ hg update -C 1
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved

		$ hg merge --debug
		searching for copies back to rev 1
		resolving manifests
		overwrite None partial False
		ancestor c334dc3be0da local 3574f3e69b1c+ remote 521a1e40188f
		conflicting flags for a
		(n)one, e(x)ec or sym(l)ink? n
		a: remote is newer -> g
		updating: a 1/1 files (100.00%)
		getting a
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		(branch merge, don't forget to commit)


		Symlink is other parent, executable is local:

		$ if [ -h a ]; then
		> echo a is a symlink
		> $TESTDIR/readlink.py a
		> elif [ -x a ]; then
		> echo a is executable
		> else
		> echo "a has no flags (default for conflicts)"
		> fi
		a has no flags (default for conflicts)