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

lfs: don't require the .hglfs file to be tracked to control the policy...

lfs: don't require the .hglfs file to be tracked to control the policy The .hgignore file doesn't need to be tracked, nor does the git equivalent of this file. I'm still a little concerned about the effects of forgetting to commit this file. But the fact that conversions maintain the hashes if only the normal vs external storage changes, should make this less risky.

Denis Laxalde - - Load All Authors

File last commit:

r34662:eb586ed5 default


                r35825:4425790f

stable

Download file

             test-merge6.t
        
                    72 lines
            
             | 1.9 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-merge6.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Pradeepkumar Gayam
    
tests: unify test-merge6

              r11979
            
        $ cat <<EOF > merge

        > import sys, os

        Augie Fackler
    
tests: clean up many print statements to be print functions instead...

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

        Pradeepkumar Gayam
    
tests: unify test-merge6

              r11979
            
        > EOF

        Augie Fackler
    
tests: clean up even more direct `python` calls with $PYTHON...

              r33286
            
        $ HGMERGE="$PYTHON ../merge"; export HGMERGE

        Pradeepkumar Gayam
    
tests: unify test-merge6

              r11979
            
        Martin Geisler
    
tests: remove redundant mkdir...

              r13956
            
        $ hg init A1

        Pradeepkumar Gayam
    
tests: unify test-merge6

              r11979
            
        $ cd A1

        $ echo This is file foo1 > foo

        $ echo This is file bar1 > bar

        $ hg add foo bar

        Martin Geisler
    
tests: remove unneeded -d flags...

              r12156
            
        $ hg commit -m "commit text"

        Pradeepkumar Gayam
    
tests: unify test-merge6

              r11979
            
        $ 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

        Martin Geisler
    
tests: remove unneeded -d flags...

              r12156
            
        $ hg commit -m "commit test"

        Pradeepkumar Gayam
    
tests: unify test-merge6

              r11979
            
        $ cd ../B1

        $ echo This is file foo22 > foo

        Martin Geisler
    
tests: remove unneeded -d flags...

              r12156
            
        $ hg commit -m "commit test"

        Pradeepkumar Gayam
    
tests: unify test-merge6

              r11979
            
        $ 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)

        Denis Laxalde
    
transaction-summary: show the range of new revisions upon pull/unbundle (BC)...

              r34662
            
        new changesets b90e70beeb58

        Pradeepkumar Gayam
    
tests: unify test-merge6

              r11979
            
        (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)

        Martin Geisler
    
tests: remove unneeded -d flags...

              r12156
            
        $ hg commit -m "commit test"

        Pradeepkumar Gayam
    
tests: unify test-merge6

              r11979
            
      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)

        Denis Laxalde
    
transaction-summary: show the range of new revisions upon pull/unbundle (BC)...

              r34662
            
        new changesets e1adc944e717

        Pradeepkumar Gayam
    
tests: unify test-merge6

              r11979
            
        (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)

        Martin Geisler
    
tests: remove unneeded -d flags...

              r12156
            
        $ hg commit -m "commit test"

        Pradeepkumar Gayam
    
tests: unify test-merge6

              r11979
            
      bar should remain deleted.

        $ hg manifest --debug

        f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644   foo

        Mads Kiilerich
    
tests: add missing trailing 'cd ..'...

              r16913
            
        $ 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

Pradeepkumar Gayam tests: unify test-merge6	r11979	$ cat <<EOF > merge
		> import sys, os
Augie Fackler tests: clean up many print statements to be print functions instead...	r33687	> print("merging for", os.path.basename(sys.argv[1]))
Pradeepkumar Gayam tests: unify test-merge6	r11979	> EOF
Augie Fackler tests: clean up even more direct `python` calls with $PYTHON...	r33286	$ HGMERGE="$PYTHON ../merge"; export HGMERGE
Pradeepkumar Gayam tests: unify test-merge6	r11979
Martin Geisler tests: remove redundant mkdir...	r13956	$ hg init A1
Pradeepkumar Gayam tests: unify test-merge6	r11979	$ cd A1
		$ echo This is file foo1 > foo
		$ echo This is file bar1 > bar
		$ hg add foo bar
Martin Geisler tests: remove unneeded -d flags...	r12156	$ hg commit -m "commit text"
Pradeepkumar Gayam tests: unify test-merge6	r11979
		$ 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
Martin Geisler tests: remove unneeded -d flags...	r12156	$ hg commit -m "commit test"
Pradeepkumar Gayam tests: unify test-merge6	r11979
		$ cd ../B1
		$ echo This is file foo22 > foo
Martin Geisler tests: remove unneeded -d flags...	r12156	$ hg commit -m "commit test"
Pradeepkumar Gayam tests: unify test-merge6	r11979
		$ 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)
Denis Laxalde transaction-summary: show the range of new revisions upon pull/unbundle (BC)...	r34662	new changesets b90e70beeb58
Pradeepkumar Gayam tests: unify test-merge6	r11979	(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)
Martin Geisler tests: remove unneeded -d flags...	r12156	$ hg commit -m "commit test"
Pradeepkumar Gayam tests: unify test-merge6	r11979	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)
Denis Laxalde transaction-summary: show the range of new revisions upon pull/unbundle (BC)...	r34662	new changesets e1adc944e717
Pradeepkumar Gayam tests: unify test-merge6	r11979	(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)
Martin Geisler tests: remove unneeded -d flags...	r12156	$ hg commit -m "commit test"
Pradeepkumar Gayam tests: unify test-merge6	r11979	bar should remain deleted.
		$ hg manifest --debug
		f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644 foo
Mads Kiilerich tests: add missing trailing 'cd ..'...	r16913
		$ cd ..