upstream/mercurial-mirror Files · tests/test-eol-clone.t

rebase: choose default destination the same way as 'hg merge' (BC)...

rebase: choose default destination the same way as 'hg merge' (BC) This changeset finally make 'hg rebase' choose its default destination using the same logic as 'hg merge'. The previous default was "tipmost changeset on the current branch", the new default is "the other head if there is only one". This change has multiple consequences: - Multiple tests which were not rebasing anything (rebasing from tipmost head) are now rebasing on the other "lower" branch. This is the expected new behavior. - A test is now explicitly aborting when there is too many heads on the branch. This is the expected behavior. - We gained a better detection of the "nothing to rebase" case while performing 'hg pull --rebase' so the message have been updated. Making clearer than an update was performed and why. This is beneficial side-effect. - Rebasing from an active bookmark will behave the same as 'hg merge' from a bookmark.

Mads Kiilerich - - Load All Authors

File last commit:

r16913:f2719b38 default


                r28189:fac3a24b

default

Download file

             test-eol-clone.t
        
                    76 lines
            
             | 1.3 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-eol-clone.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      Testing cloning with the EOL extension

        $ cat >> $HGRCPATH <<EOF

        > [extensions]

        > eol =

        > 

        > [eol]

        > native = CRLF

        > EOF

      setup repository

        $ hg init repo

        $ cd repo

        $ cat > .hgeol <<EOF

        > [patterns]

        > **.txt = native

        > EOF

        $ printf "first\r\nsecond\r\nthird\r\n" > a.txt

        $ hg commit --addremove -m 'checkin'

        adding .hgeol

        adding a.txt

      Clone

        $ cd ..

        $ hg clone repo repo-2

        updating to branch default

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

        $ cd repo-2

        $ cat a.txt

        first\r (esc)

        second\r (esc)

        third\r (esc)

        $ hg cat a.txt

        first

        second

        third

        $ hg remove .hgeol

        $ hg commit -m 'remove eol'

        $ hg push --quiet

        $ cd ..

      Test clone of repo with .hgeol in working dir, but no .hgeol in tip

        $ hg clone repo repo-3

        updating to branch default

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

        $ cd repo-3

        $ cat a.txt

        first

        second

        third

      Test clone of revision with .hgeol

        $ cd ..

        $ hg clone -r 0 repo repo-4

        adding changesets

        adding manifests

        adding file changes

        added 1 changesets with 2 changes to 2 files

        updating to branch default

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

        $ cd repo-4

        $ cat .hgeol

        [patterns]

        **.txt = native

        $ cat a.txt

        first\r (esc)

        second\r (esc)

        third\r (esc)

        $ 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

				Testing cloning with the EOL extension

				$ cat >> $HGRCPATH <<EOF
				> [extensions]
				> eol =
				>
				> [eol]
				> native = CRLF
				> EOF

				setup repository

				$ hg init repo
				$ cd repo
				$ cat > .hgeol <<EOF
				> [patterns]
				> **.txt = native
				> EOF
				$ printf "first\r\nsecond\r\nthird\r\n" > a.txt
				$ hg commit --addremove -m 'checkin'
				adding .hgeol
				adding a.txt

				Clone

				$ cd ..
				$ hg clone repo repo-2
				updating to branch default
				2 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ cd repo-2
				$ cat a.txt
				first\r (esc)
				second\r (esc)
				third\r (esc)
				$ hg cat a.txt
				first
				second
				third
				$ hg remove .hgeol
				$ hg commit -m 'remove eol'
				$ hg push --quiet
				$ cd ..

				Test clone of repo with .hgeol in working dir, but no .hgeol in tip

				$ hg clone repo repo-3
				updating to branch default
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ cd repo-3

				$ cat a.txt
				first
				second
				third

				Test clone of revision with .hgeol

				$ cd ..
				$ hg clone -r 0 repo repo-4
				adding changesets
				adding manifests
				adding file changes
				added 1 changesets with 2 changes to 2 files
				updating to branch default
				2 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ cd repo-4
				$ cat .hgeol
				[patterns]
				**.txt = native

				$ cat a.txt
				first\r (esc)
				second\r (esc)
				third\r (esc)

				$ cd ..