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

rhg: add resolve_file_args to path_utils.rs...

rhg: add resolve_file_args to path_utils.rs Extracted logic for resolving `FILE ...` arguments from cat.rs into a new function in path_utils.rs. I plan to use this for rhg annotate. I tried to reuse hg::utils::files::canonical_path instead, but that didn't work. For example it reports a InsideDotHg error for any path containing "..".

Arseniy Alekseyev - - Load All Authors

File last commit:

r50516:55c6ebd1 stable


                r53438:f33f37ac

tip default

Download file

             test-bookmarks-merge.t
        
                    153 lines
            
             | 4.2 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-bookmarks-merge.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        David Soria Parra
    
bookmarks: delete divergent bookmarks on merge

              r16706
            
      # init

        Arseniy Alekseyev
    
tests: run many tests in $TESTTMP/repo instead of $TESTTMP...

              r50516
            
        $ hg init repo

        $ cd repo

        David Soria Parra
    
bookmarks: delete divergent bookmarks on merge

              r16706
            
        $ echo a > a

        $ hg add a

        $ hg commit -m'a'

        $ echo b > b

        $ hg add b

        $ hg commit -m'b'

        $ hg up -C 0

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

        $ echo c > c

        $ hg add c

        $ hg commit -m'c'

        created new head

      # test merging of diverged bookmarks

        $ hg bookmark -r 1 "c@diverge"

        $ hg bookmark -r 1 b

        $ hg bookmark c

        $ hg bookmarks

           b                         1:d2ae7f538514

         * c                         2:d36c0562f908

           c@diverge                 1:d2ae7f538514

        $ hg merge "c@diverge"

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

        (branch merge, don't forget to commit)

        $ hg commit -m'merge'

        $ hg bookmarks

           b                         1:d2ae7f538514

         * c                         3:b8f96cf4688b

        David Soria Parra
    
merge: respect bookmarks during merge...

              r16708
            
        $ hg up -C 3

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

        Siddharth Agarwal
    
update: when deactivating a bookmark, print a message...

              r21404
            
        (leaving bookmark c)

        David Soria Parra
    
merge: respect bookmarks during merge...

              r16708
            
        $ echo d > d

        $ hg add d

        $ hg commit -m'd'

        $ hg up -C 3

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

        $ echo e > e

        $ hg add e

        $ hg commit -m'e'

        created new head

        $ hg up -C 5

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

        $ hg bookmark e

        $ hg bookmarks

           b                         1:d2ae7f538514

           c                         3:b8f96cf4688b

         * e                         5:26bee9c5bcf3

      # the picked side is bookmarked

        $ hg up -C 4

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

        Siddharth Agarwal
    
update: when deactivating a bookmark, print a message...

              r21404
            
        (leaving bookmark e)

        David Soria Parra
    
merge: respect bookmarks during merge...

              r16708
            
        $ hg merge

        abort: heads are bookmarked - please merge with an explicit rev

        Kyle Lippincott
    
destutil: provide hint on rebase+merge for how to specify destination/rev...

              r43384
            
        (run 'hg heads' to see all heads, specify rev with -r)

        David Soria Parra
    
merge: respect bookmarks during merge...

              r16708
            
        [255]

      # our revision is bookmarked

        $ hg up -C e

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

        Stephen Lee
    
update: show message when a bookmark is activated by update...

              r21503
            
        (activating bookmark e)

        David Soria Parra
    
merge: respect bookmarks during merge...

              r16708
            
        $ hg merge

        abort: no matching bookmark to merge - please merge with an explicit rev or bookmark

        Kyle Lippincott
    
destutil: provide hint on rebase+merge for how to specify destination/rev...

              r43384
            
        (run 'hg heads' to see all heads, specify rev with -r)

        David Soria Parra
    
merge: respect bookmarks during merge...

              r16708
            
        [255]

      # merge bookmark heads

        $ hg up -C 4

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

        Siddharth Agarwal
    
update: when deactivating a bookmark, print a message...

              r21404
            
        (leaving bookmark e)

        David Soria Parra
    
merge: respect bookmarks during merge...

              r16708
            
        $ echo f > f

        $ hg commit -Am "f"

        adding f

        Mads Kiilerich
    
bookmarks: fix head selection for merge with two bookmarked heads...

              r18122
            
        $ hg bookmarks -r 4 "e@diverged"

        $ hg up -q -C "e@diverged"

        $ hg merge

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

        (branch merge, don't forget to commit)

        $ hg parents

        changeset:   4:a0546fcfe0fb

        bookmark:    e@diverged

        user:        test

        date:        Thu Jan 01 00:00:00 1970 +0000

        summary:     d

        changeset:   5:26bee9c5bcf3

        bookmark:    e

        parent:      3:b8f96cf4688b

        user:        test

        date:        Thu Jan 01 00:00:00 1970 +0000

        summary:     e

        David Soria Parra
    
merge: respect bookmarks during merge...

              r16708
            
        $ hg up -C e

        Mads Kiilerich
    
bookmarks: fix head selection for merge with two bookmarked heads...

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

        Stephen Lee
    
update: show message when a bookmark is activated by update...

              r21503
            
        (activating bookmark e)

        David Soria Parra
    
merge: respect bookmarks during merge...

              r16708
            
        $ hg bookmarks

           b                         1:d2ae7f538514

           c                         3:b8f96cf4688b

         * e                         5:26bee9c5bcf3

           e@diverged                4:a0546fcfe0fb

        $ hg merge

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

        (branch merge, don't forget to commit)

        $ hg commit -m'merge'

        $ hg bookmarks

           b                         1:d2ae7f538514

           c                         3:b8f96cf4688b

         * e                         7:ca784329f0ba

        John Li
    
tests: merging bookmarked heads...

              r17394
            
      # test warning when all heads are inactive bookmarks

        $ hg up -C 6

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

        Siddharth Agarwal
    
update: when deactivating a bookmark, print a message...

              r21404
            
        (leaving bookmark e)

        John Li
    
tests: merging bookmarked heads...

              r17394
            
        $ echo g > g

        $ hg commit -Am 'g'

        adding g

        $ hg bookmark -i g

        $ hg bookmarks

           b                         1:d2ae7f538514

           c                         3:b8f96cf4688b

           e                         7:ca784329f0ba

           g                         8:04dd21731d95

        $ hg heads

        changeset:   8:04dd21731d95

        bookmark:    g

        tag:         tip

        parent:      6:be381d1126a0

        user:        test

        date:        Thu Jan 01 00:00:00 1970 +0000

        summary:     g

        changeset:   7:ca784329f0ba

        bookmark:    e

        parent:      5:26bee9c5bcf3

        parent:      4:a0546fcfe0fb

        user:        test

        date:        Thu Jan 01 00:00:00 1970 +0000

        summary:     merge

        $ hg merge

        abort: heads are bookmarked - please merge with an explicit rev

        Kyle Lippincott
    
destutil: provide hint on rebase+merge for how to specify destination/rev...

              r43384
            
        (run 'hg heads' to see all heads, specify rev with -r)

        John Li
    
tests: merging bookmarked heads...

              r17394
            
        [255]

	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

David Soria Parra bookmarks: delete divergent bookmarks on merge	r16706	# init

Arseniy Alekseyev tests: run many tests in $TESTTMP/repo instead of $TESTTMP...	r50516	$ hg init repo
		$ cd repo
David Soria Parra bookmarks: delete divergent bookmarks on merge	r16706	$ echo a > a
		$ hg add a
		$ hg commit -m'a'
		$ echo b > b
		$ hg add b
		$ hg commit -m'b'
		$ hg up -C 0
		0 files updated, 0 files merged, 1 files removed, 0 files unresolved
		$ echo c > c
		$ hg add c
		$ hg commit -m'c'
		created new head

		# test merging of diverged bookmarks
		$ hg bookmark -r 1 "c@diverge"
		$ hg bookmark -r 1 b
		$ hg bookmark c
		$ hg bookmarks
		b 1:d2ae7f538514
		* c 2:d36c0562f908
		c@diverge 1:d2ae7f538514
		$ hg merge "c@diverge"
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		(branch merge, don't forget to commit)
		$ hg commit -m'merge'
		$ hg bookmarks
		b 1:d2ae7f538514
		* c 3:b8f96cf4688b
David Soria Parra merge: respect bookmarks during merge...	r16708
		$ hg up -C 3
		0 files updated, 0 files merged, 0 files removed, 0 files unresolved
Siddharth Agarwal update: when deactivating a bookmark, print a message...	r21404	(leaving bookmark c)
David Soria Parra merge: respect bookmarks during merge...	r16708	$ echo d > d
		$ hg add d
		$ hg commit -m'd'

		$ hg up -C 3
		0 files updated, 0 files merged, 1 files removed, 0 files unresolved
		$ echo e > e
		$ hg add e
		$ hg commit -m'e'
		created new head
		$ hg up -C 5
		0 files updated, 0 files merged, 0 files removed, 0 files unresolved
		$ hg bookmark e
		$ hg bookmarks
		b 1:d2ae7f538514
		c 3:b8f96cf4688b
		* e 5:26bee9c5bcf3

		# the picked side is bookmarked

		$ hg up -C 4
		1 files updated, 0 files merged, 1 files removed, 0 files unresolved
Siddharth Agarwal update: when deactivating a bookmark, print a message...	r21404	(leaving bookmark e)
David Soria Parra merge: respect bookmarks during merge...	r16708	$ hg merge
		abort: heads are bookmarked - please merge with an explicit rev
Kyle Lippincott destutil: provide hint on rebase+merge for how to specify destination/rev...	r43384	(run 'hg heads' to see all heads, specify rev with -r)
David Soria Parra merge: respect bookmarks during merge...	r16708	[255]

		# our revision is bookmarked

		$ hg up -C e
		1 files updated, 0 files merged, 1 files removed, 0 files unresolved
Stephen Lee update: show message when a bookmark is activated by update...	r21503	(activating bookmark e)
David Soria Parra merge: respect bookmarks during merge...	r16708	$ hg merge
		abort: no matching bookmark to merge - please merge with an explicit rev or bookmark
Kyle Lippincott destutil: provide hint on rebase+merge for how to specify destination/rev...	r43384	(run 'hg heads' to see all heads, specify rev with -r)
David Soria Parra merge: respect bookmarks during merge...	r16708	[255]

		# merge bookmark heads

		$ hg up -C 4
		1 files updated, 0 files merged, 1 files removed, 0 files unresolved
Siddharth Agarwal update: when deactivating a bookmark, print a message...	r21404	(leaving bookmark e)
David Soria Parra merge: respect bookmarks during merge...	r16708	$ echo f > f
		$ hg commit -Am "f"
		adding f
Mads Kiilerich bookmarks: fix head selection for merge with two bookmarked heads...	r18122	$ hg bookmarks -r 4 "e@diverged"
		$ hg up -q -C "e@diverged"
		$ hg merge
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		(branch merge, don't forget to commit)
		$ hg parents
		changeset: 4:a0546fcfe0fb
		bookmark: e@diverged
		user: test
		date: Thu Jan 01 00:00:00 1970 +0000
		summary: d

		changeset: 5:26bee9c5bcf3
		bookmark: e
		parent: 3:b8f96cf4688b
		user: test
		date: Thu Jan 01 00:00:00 1970 +0000
		summary: e

David Soria Parra merge: respect bookmarks during merge...	r16708	$ hg up -C e
Mads Kiilerich bookmarks: fix head selection for merge with two bookmarked heads...	r18122	1 files updated, 0 files merged, 1 files removed, 0 files unresolved
Stephen Lee update: show message when a bookmark is activated by update...	r21503	(activating bookmark e)
David Soria Parra merge: respect bookmarks during merge...	r16708	$ hg bookmarks
		b 1:d2ae7f538514
		c 3:b8f96cf4688b
		* e 5:26bee9c5bcf3
		e@diverged 4:a0546fcfe0fb
		$ hg merge
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		(branch merge, don't forget to commit)
		$ hg commit -m'merge'
		$ hg bookmarks
		b 1:d2ae7f538514
		c 3:b8f96cf4688b
		* e 7:ca784329f0ba
John Li tests: merging bookmarked heads...	r17394
		# test warning when all heads are inactive bookmarks

		$ hg up -C 6
		1 files updated, 0 files merged, 1 files removed, 0 files unresolved
Siddharth Agarwal update: when deactivating a bookmark, print a message...	r21404	(leaving bookmark e)
John Li tests: merging bookmarked heads...	r17394	$ echo g > g
		$ hg commit -Am 'g'
		adding g
		$ hg bookmark -i g
		$ hg bookmarks
		b 1:d2ae7f538514
		c 3:b8f96cf4688b
		e 7:ca784329f0ba
		g 8:04dd21731d95
		$ hg heads
		changeset: 8:04dd21731d95
		bookmark: g
		tag: tip
		parent: 6:be381d1126a0
		user: test
		date: Thu Jan 01 00:00:00 1970 +0000
		summary: g

		changeset: 7:ca784329f0ba
		bookmark: e
		parent: 5:26bee9c5bcf3
		parent: 4:a0546fcfe0fb
		user: test
		date: Thu Jan 01 00:00:00 1970 +0000
		summary: merge

		$ hg merge
		abort: heads are bookmarked - please merge with an explicit rev
Kyle Lippincott destutil: provide hint on rebase+merge for how to specify destination/rev...	r43384	(run 'hg heads' to see all heads, specify rev with -r)
John Li tests: merging bookmarked heads...	r17394	[255]