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

hgweb, spartan: add "URL breadcrumbs"...

hgweb, spartan: add "URL breadcrumbs" This change adds a "URL breadcrumb" to the "title" of the pages on the spartan template. By title I mean the first line that is shown right below the page selection row, which shows the name of the page that is being viewed, along with some additional information. In doing so it standarizes those "titles" which now follow the pattern: URL breadcumb / page details

Kevin Bullock - - Load All Authors

File last commit:

r15619:6c8573dd default


                r18259:7bf412b7

default

Download file

             test-merge-force.t
        
                    45 lines
            
             | 682 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-merge-force.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ hg init

        $ echo a > a

        $ hg ci -qAm 'add a'

        $ echo b > b

        $ hg ci -qAm 'add b'

        $ hg up -qC 0

        $ hg rm a

        $ hg ci -m 'rm a'

        created new head

        $ hg up -qC 1

        $ rm a

      Local deleted a file, remote removed

      Should fail, since there are deleted files:

        $ hg merge

        abort: outstanding uncommitted changes

        (use 'hg status' to list changes)

        [255]

      Should succeed with --force:

        $ hg -v merge --force

        resolving manifests

        removing a

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

        (branch merge, don't forget to commit)

      Should show 'a' as removed:

        $ hg status

        R a

        $ hg ci -m merge

      Should not show 'a':

        $ hg manifest

        b

	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

				$ hg init

				$ echo a > a
				$ hg ci -qAm 'add a'

				$ echo b > b
				$ hg ci -qAm 'add b'

				$ hg up -qC 0
				$ hg rm a
				$ hg ci -m 'rm a'
				created new head

				$ hg up -qC 1
				$ rm a

				Local deleted a file, remote removed

				Should fail, since there are deleted files:

				$ hg merge
				abort: outstanding uncommitted changes
				(use 'hg status' to list changes)
				[255]

				Should succeed with --force:

				$ hg -v merge --force
				resolving manifests
				removing a
				0 files updated, 0 files merged, 1 files removed, 0 files unresolved
				(branch merge, don't forget to commit)

				Should show 'a' as removed:

				$ hg status
				R a

				$ hg ci -m merge

				Should not show 'a':

				$ hg manifest
				b