upstream/mercurial-mirror Files · tests/test-unrelated-pull.t

patch: don't separate \r and \n when colorizing diff output...

patch: don't separate \r and \n when colorizing diff output When displaying diffs, \r at the end of a line is treated as trailing whitespace. This causes an ANSI escape code to be inserted between \r and \n. Some programs, such as less since version 530 (maybe earlier, but at least not version 487) displays ^M when it encounters a lone \r. This causes a lot of noise in diff output on Windows, where \r\n is used to terminate lines. We avoid that by treating both \n and \r\n as end of line when considering trailing whitespace.

Denis Laxalde - - Load All Authors

File last commit:

r34662:eb586ed5 default


                r38649:e1987261

default

Download file

             test-unrelated-pull.t
        
                    46 lines
            
             | 900 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-unrelated-pull.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ hg init a

        $ cd a

        $ echo 123 > a

        $ hg add a

        $ hg commit -m "a" -u a

        $ cd ..

        $ hg init b

        $ cd b

        $ echo 321 > b

        $ hg add b

        $ hg commit -m "b" -u b

        $ hg pull ../a

        pulling from ../a

        searching for changes

        abort: repository is unrelated

        [255]

        $ hg pull -f ../a

        pulling from ../a

        searching for changes

        warning: repository is unrelated

        requesting all changes

        adding changesets

        adding manifests

        adding file changes

        added 1 changesets with 1 changes to 1 files (+1 heads)

        new changesets 9a79c33a9db3

        (run 'hg heads' to see heads, 'hg merge' to merge)

        $ hg heads

        changeset:   1:9a79c33a9db3

        tag:         tip

        parent:      -1:000000000000

        user:        a

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

        summary:     a

        changeset:   0:01f8062b2de5

        user:        b

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

        summary:     b

        $ 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

				$ hg init a
				$ cd a
				$ echo 123 > a
				$ hg add a
				$ hg commit -m "a" -u a

				$ cd ..
				$ hg init b
				$ cd b
				$ echo 321 > b
				$ hg add b
				$ hg commit -m "b" -u b

				$ hg pull ../a
				pulling from ../a
				searching for changes
				abort: repository is unrelated
				[255]

				$ hg pull -f ../a
				pulling from ../a
				searching for changes
				warning: repository is unrelated
				requesting all changes
				adding changesets
				adding manifests
				adding file changes
				added 1 changesets with 1 changes to 1 files (+1 heads)
				new changesets 9a79c33a9db3
				(run 'hg heads' to see heads, 'hg merge' to merge)

				$ hg heads
				changeset: 1:9a79c33a9db3
				tag: tip
				parent: -1:000000000000
				user: a
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: a

				changeset: 0:01f8062b2de5
				user: b
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: b


				$ cd ..