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

largefiles: restore standins according to restored dirstate...

largefiles: restore standins according to restored dirstate Before this patch, standins are restored from the NEW parent of the working directory at "hg rollback", and this causes: - standins removed in the rollback-ed revision are restored, and become orphan, because they are already marked as "R" in the restored dirstate and expected to be unlinked - standins added in the rollback-ed revision are left as they were before rollback, because they are not included in the new parent (this may not be so serious) This patch replaces the "merge.update" invocation with a specific implementation to restore standins according to restored dirstate. This is also the preparation to centralize the logic of updating largefiles into the function wrapping "merge.update" in the subsequent patch. After that patch, "merge.update" will also update largefiles in the working directory and be redundant for restoring standins only.

Nathan Goldbaum - - Load All Authors

File last commit:

r21940:9209c02f stable


                r22285:85bded43

default

Download file

             test-merge9.t
        
                    95 lines
            
             | 1.7 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-merge9.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Pradeepkumar Gayam
    
tests: unify test-merge9

              r11982
            
      test that we don't interrupt the merge session if

      a file-level merge failed

        $ hg init repo

        $ cd repo

        $ echo foo > foo

        $ echo a > bar

        $ hg ci -Am 'add foo'

        adding bar

        adding foo

        $ hg mv foo baz

        $ echo b >> bar

        $ echo quux > quux1

        $ hg ci -Am 'mv foo baz'

        adding quux1

        $ hg up -qC 0

        $ echo >> foo

        $ echo c >> bar

        $ echo quux > quux2

        $ hg ci -Am 'change foo'

        adding quux2

        created new head

      test with the rename on the remote side

        $ HGMERGE=false hg merge

        merging bar

        merging bar failed!

        merging foo and baz to baz

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

        Brodie Rao
    
merge: suggest 'hg up -C .' for discarding changes, not 'hg up -C'...

              r12314
            
        use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon

        Matt Mackall
    
tests: add exit codes to unified tests

              r12316
            
        [1]

        Pradeepkumar Gayam
    
tests: unify test-merge9

              r11982
            
        $ hg resolve -l

        U bar

        R baz

      test with the rename on the local side

        $ hg up -C 1

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

        $ HGMERGE=false hg merge

        merging bar

        merging bar failed!

        merging baz and foo to baz

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

        Brodie Rao
    
merge: suggest 'hg up -C .' for discarding changes, not 'hg up -C'...

              r12314
            
        use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon

        Matt Mackall
    
tests: add exit codes to unified tests

              r12316
            
        [1]

        Pradeepkumar Gayam
    
tests: unify test-merge9

              r11982
            
      show unresolved

        $ hg resolve -l

        U bar

        R baz

      unmark baz

        $ hg resolve -u baz

      show

        $ hg resolve -l

        U bar

        U baz

        $ hg st

        M bar

        M baz

        M quux2

        ? bar.orig

      re-resolve baz

        $ hg resolve baz

        merging baz and foo to baz

      after resolve

        $ hg resolve -l

        U bar

        R baz

      resolve all warning

        $ hg resolve

        Nathan Goldbaum
    
resolve: report no argument warning using a hint...

              r21940
            
        abort: no files or directories specified

        (use --all to remerge all files)

        Matt Mackall
    
tests: add exit codes to unified tests

              r12316
            
        [255]

        Pradeepkumar Gayam
    
tests: unify test-merge9

              r11982
            
      resolve all

        $ hg resolve -a

        merging bar

        warning: conflicts during merge.

        Matt Mackall
    
merge: give a special message for internal:merge failure (issue3105)

              r15501
            
        merging bar incomplete! (edit conflicts, then use 'hg resolve --mark')

        Matt Mackall
    
tests: add exit codes to unified tests

              r12316
            
        [1]

        Pradeepkumar Gayam
    
tests: unify test-merge9

              r11982
            
      after

        $ hg resolve -l

        U bar

        R baz

        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-merge9	r11982	test that we don't interrupt the merge session if
		a file-level merge failed

		$ hg init repo
		$ cd repo

		$ echo foo > foo
		$ echo a > bar
		$ hg ci -Am 'add foo'
		adding bar
		adding foo

		$ hg mv foo baz
		$ echo b >> bar
		$ echo quux > quux1
		$ hg ci -Am 'mv foo baz'
		adding quux1

		$ hg up -qC 0
		$ echo >> foo
		$ echo c >> bar
		$ echo quux > quux2
		$ hg ci -Am 'change foo'
		adding quux2
		created new head

		test with the rename on the remote side
		$ HGMERGE=false hg merge
		merging bar
		merging bar failed!
		merging foo and baz to baz
		1 files updated, 1 files merged, 0 files removed, 1 files unresolved
Brodie Rao merge: suggest 'hg up -C .' for discarding changes, not 'hg up -C'...	r12314	use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
Matt Mackall tests: add exit codes to unified tests	r12316	[1]
Pradeepkumar Gayam tests: unify test-merge9	r11982	$ hg resolve -l
		U bar
		R baz

		test with the rename on the local side
		$ hg up -C 1
		3 files updated, 0 files merged, 1 files removed, 0 files unresolved
		$ HGMERGE=false hg merge
		merging bar
		merging bar failed!
		merging baz and foo to baz
		1 files updated, 1 files merged, 0 files removed, 1 files unresolved
Brodie Rao merge: suggest 'hg up -C .' for discarding changes, not 'hg up -C'...	r12314	use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
Matt Mackall tests: add exit codes to unified tests	r12316	[1]
Pradeepkumar Gayam tests: unify test-merge9	r11982
		show unresolved
		$ hg resolve -l
		U bar
		R baz

		unmark baz
		$ hg resolve -u baz

		show
		$ hg resolve -l
		U bar
		U baz
		$ hg st
		M bar
		M baz
		M quux2
		? bar.orig

		re-resolve baz
		$ hg resolve baz
		merging baz and foo to baz

		after resolve
		$ hg resolve -l
		U bar
		R baz

		resolve all warning
		$ hg resolve
Nathan Goldbaum resolve: report no argument warning using a hint...	r21940	abort: no files or directories specified
		(use --all to remerge all files)
Matt Mackall tests: add exit codes to unified tests	r12316	[255]
Pradeepkumar Gayam tests: unify test-merge9	r11982
		resolve all
		$ hg resolve -a
		merging bar
		warning: conflicts during merge.
Matt Mackall merge: give a special message for internal:merge failure (issue3105)	r15501	merging bar incomplete! (edit conflicts, then use 'hg resolve --mark')
Matt Mackall tests: add exit codes to unified tests	r12316	[1]
Pradeepkumar Gayam tests: unify test-merge9	r11982
		after
		$ hg resolve -l
		U bar
		R baz
Mads Kiilerich tests: add missing trailing 'cd ..'...	r16913
		$ cd ..