upstream/mercurial-mirror Files · tests/test-merge6.t

scmutil: proxy revrange() through repo to break import cycles...

scmutil: proxy revrange() through repo to break import cycles This was one of the hardest import cycles as scmutil is widely used and revset functions are likely to depend on a variety of modules. New repo.anyrevs() does not expand user aliases by default to copy the behavior of the existing repo.revs(). I don't want to add new function to localrepository, but this function is quite similar to repo.revs() so it won't increase the complexity of the localrepository class so much.

Mads Kiilerich - - Load All Authors

File last commit:

r16913:f2719b38 default


                r31025:6cf28575

default

Download file

             test-merge6.t
        
                    70 lines
            
             | 1.8 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-merge6.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ cat <<EOF > merge

        > import sys, os

        > print "merging for", os.path.basename(sys.argv[1])

        > EOF

        $ HGMERGE="python ../merge"; export HGMERGE

        $ hg init A1

        $ cd A1

        $ echo This is file foo1 > foo

        $ echo This is file bar1 > bar

        $ hg add foo bar

        $ hg commit -m "commit text"

        $ cd ..

        $ hg clone A1 B1

        updating to branch default

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

        $ cd A1

        $ rm bar

        $ hg remove bar

        $ hg commit -m "commit test"

        $ cd ../B1

        $ echo This is file foo22 > foo

        $ hg commit -m "commit test"

        $ cd ..

        $ hg clone A1 A2

        updating to branch default

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

        $ hg clone B1 B2

        updating to branch default

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

        $ cd A1

        $ hg pull ../B1

        pulling from ../B1

        searching for changes

        adding changesets

        adding manifests

        adding file changes

        added 1 changesets with 1 changes to 1 files (+1 heads)

        (run 'hg heads' to see heads, 'hg merge' to merge)

        $ hg merge

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

        (branch merge, don't forget to commit)

        $ hg commit -m "commit test"

      bar should remain deleted.

        $ hg manifest --debug

        f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644   foo

        $ cd ../B2

        $ hg pull ../A2

        pulling from ../A2

        searching for changes

        adding changesets

        adding manifests

        adding file changes

        added 1 changesets with 0 changes to 0 files (+1 heads)

        (run 'hg heads' to see heads, 'hg merge' to merge)

        $ hg merge

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

        (branch merge, don't forget to commit)

        $ hg commit -m "commit test"

      bar should remain deleted.

        $ hg manifest --debug

        f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644   foo

        $ cd ..

	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

				$ cat <<EOF > merge
				> import sys, os
				> print "merging for", os.path.basename(sys.argv[1])
				> EOF
				$ HGMERGE="python ../merge"; export HGMERGE

				$ hg init A1
				$ cd A1
				$ echo This is file foo1 > foo
				$ echo This is file bar1 > bar
				$ hg add foo bar
				$ hg commit -m "commit text"

				$ cd ..
				$ hg clone A1 B1
				updating to branch default
				2 files updated, 0 files merged, 0 files removed, 0 files unresolved

				$ cd A1
				$ rm bar
				$ hg remove bar
				$ hg commit -m "commit test"

				$ cd ../B1
				$ echo This is file foo22 > foo
				$ hg commit -m "commit test"

				$ cd ..
				$ hg clone A1 A2
				updating to branch default
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ hg clone B1 B2
				updating to branch default
				2 files updated, 0 files merged, 0 files removed, 0 files unresolved

				$ cd A1
				$ hg pull ../B1
				pulling from ../B1
				searching for changes
				adding changesets
				adding manifests
				adding file changes
				added 1 changesets with 1 changes to 1 files (+1 heads)
				(run 'hg heads' to see heads, 'hg merge' to merge)
				$ hg merge
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				(branch merge, don't forget to commit)
				$ hg commit -m "commit test"
				bar should remain deleted.
				$ hg manifest --debug
				f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644 foo

				$ cd ../B2
				$ hg pull ../A2
				pulling from ../A2
				searching for changes
				adding changesets
				adding manifests
				adding file changes
				added 1 changesets with 0 changes to 0 files (+1 heads)
				(run 'hg heads' to see heads, 'hg merge' to merge)
				$ hg merge
				0 files updated, 0 files merged, 1 files removed, 0 files unresolved
				(branch merge, don't forget to commit)
				$ hg commit -m "commit test"
				bar should remain deleted.
				$ hg manifest --debug
				f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644 foo

				$ cd ..