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

shelve: add a shelve extension to save/restore working changes...

shelve: add a shelve extension to save/restore working changes This extension saves shelved changes using a temporary draft commit, and bundles the temporary commit and its draft ancestors, then strips them. This strategy makes it possible to use Mercurial's bundle and merge machinery to resolve conflicts if necessary when unshelving, even when the destination commit or its ancestors have been amended, squashed, or evolved. (Once a change has been unshelved, its associated unbundled commits are either rolled back or stripped.) Storing the shelved change as a bundle also avoids the difficulty that hidden commits would cause, of making it impossible to amend the parent if it is a draft commits (a common scenario). Although this extension shares its name and some functionality with the third party hgshelve extension, it has little else in common. Notably, the hgshelve extension shelves changes as unified diffs, which makes conflict resolution a matter of finding .rej files and conflict markers, and cleaning up the mess by hand. We do not yet allow hunk-level choosing of changes to record. Compared to the hgshelve extension, this is a small regression in usability, but we hope to integrate that at a later point, once the record machinery becomes more reusable and robust.

Matt Mackall - - Load All Authors

File last commit:

r15501:2371f4ae default


                r19854:49d4919d

default

Download file

             test-conflict.t
        
                    33 lines
            
             | 732 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-conflict.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Nicolas Dumazet
    
tests: unify test-conflict

              r11797
            
        $ hg init

        $ echo "nothing" > a

        $ hg add a

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

              r12156
            
        $ hg commit -m ancestor

        Nicolas Dumazet
    
tests: unify test-conflict

              r11797
            
        $ echo "something" > a

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

              r12156
            
        $ hg commit -m branch1

        Nicolas Dumazet
    
tests: unify test-conflict

              r11797
            
        $ hg co 0

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

        $ echo "something else" > a

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

              r12156
            
        $ hg commit -m branch2

        Nicolas Dumazet
    
tests: unify test-conflict

              r11797
            
        created new head

        $ hg merge 1

        merging a

        warning: conflicts during merge.

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

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

        Nicolas Dumazet
    
tests: unify test-conflict

              r11797
            
        0 files updated, 0 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]

        Nicolas Dumazet
    
tests: unify test-conflict

              r11797
            
        $ hg id

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

              r12156
            
        32e80765d7fe+75234512624c+ tip

        Nicolas Dumazet
    
tests: unify test-conflict

              r11797
            
        $ cat a

        <<<<<<< local

        something else

        =======

        something

        >>>>>>> other

        $ hg status

        M a

        ? a.orig

	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

Nicolas Dumazet tests: unify test-conflict	r11797	$ hg init
		$ echo "nothing" > a
		$ hg add a
Martin Geisler tests: remove unneeded -d flags...	r12156	$ hg commit -m ancestor
Nicolas Dumazet tests: unify test-conflict	r11797	$ echo "something" > a
Martin Geisler tests: remove unneeded -d flags...	r12156	$ hg commit -m branch1
Nicolas Dumazet tests: unify test-conflict	r11797	$ hg co 0
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		$ echo "something else" > a
Martin Geisler tests: remove unneeded -d flags...	r12156	$ hg commit -m branch2
Nicolas Dumazet tests: unify test-conflict	r11797	created new head

		$ hg merge 1
		merging a
		warning: conflicts during merge.
Matt Mackall merge: give a special message for internal:merge failure (issue3105)	r15501	merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
Nicolas Dumazet tests: unify test-conflict	r11797	0 files updated, 0 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]
Nicolas Dumazet tests: unify test-conflict	r11797
		$ hg id
Martin Geisler tests: remove unneeded -d flags...	r12156	32e80765d7fe+75234512624c+ tip
Nicolas Dumazet tests: unify test-conflict	r11797
		$ cat a
		<<<<<<< local
		something else
		=======
		something
		>>>>>>> other

		$ hg status
		M a
		? a.orig