upstream/mercurial-mirror Files · tests/test-pull-pull-corruption.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-pull-pull-corruption.t
        
                    72 lines
            
             | 1.6 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-pull-pull-corruption.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      Corrupt an hg repo with two pulls.

      create one repo with a long history

        $ hg init source1

        $ cd source1

        $ touch foo

        $ hg add foo

        $ for i in 1 2 3 4 5 6 7 8 9 10; do

        >     echo $i >> foo

        >     hg ci -m $i

        > done

        $ cd ..

      create one repo with a shorter history

        $ hg clone -r 0 source1 source2

        adding changesets

        adding manifests

        adding file changes

        added 1 changesets with 1 changes to 1 files

        updating to branch default

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

        $ cd source2

        $ echo a >> foo

        $ hg ci -m a

        $ cd ..

      create a third repo to pull both other repos into it

        $ hg init corrupted

        $ cd corrupted

      use a hook to make the second pull start while the first one is still running

        $ echo '[hooks]' >> .hg/hgrc

        $ echo 'prechangegroup = sleep 5' >> .hg/hgrc

      start a pull...

        $ hg pull ../source1 > pull.out 2>&1 &

      ... and start another pull before the first one has finished

        $ sleep 1

        $ hg pull ../source2 2>/dev/null

        pulling from ../source2

        searching for changes

        adding changesets

        adding manifests

        adding file changes

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

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

        $ cat pull.out

        pulling from ../source1

        requesting all changes

        adding changesets

        adding manifests

        adding file changes

        added 10 changesets with 10 changes to 1 files

        (run 'hg update' to get a working copy)

      see the result

        $ wait

        $ hg verify

        checking changesets

        checking manifests

        crosschecking files in changesets and manifests

        checking files

        1 files, 11 changesets, 11 total revisions

        $ 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

				Corrupt an hg repo with two pulls.
				create one repo with a long history

				$ hg init source1
				$ cd source1
				$ touch foo
				$ hg add foo
				$ for i in 1 2 3 4 5 6 7 8 9 10; do
				> echo $i >> foo
				> hg ci -m $i
				> done
				$ cd ..

				create one repo with a shorter history

				$ hg clone -r 0 source1 source2
				adding changesets
				adding manifests
				adding file changes
				added 1 changesets with 1 changes to 1 files
				updating to branch default
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ cd source2
				$ echo a >> foo
				$ hg ci -m a
				$ cd ..

				create a third repo to pull both other repos into it

				$ hg init corrupted
				$ cd corrupted

				use a hook to make the second pull start while the first one is still running

				$ echo '[hooks]' >> .hg/hgrc
				$ echo 'prechangegroup = sleep 5' >> .hg/hgrc

				start a pull...

				$ hg pull ../source1 > pull.out 2>&1 &

				... and start another pull before the first one has finished

				$ sleep 1
				$ hg pull ../source2 2>/dev/null
				pulling from ../source2
				searching for changes
				adding changesets
				adding manifests
				adding file changes
				added 1 changesets with 1 changes to 1 files (+1 heads)
				(run 'hg heads' to see heads, 'hg merge' to merge)
				$ cat pull.out
				pulling from ../source1
				requesting all changes
				adding changesets
				adding manifests
				adding file changes
				added 10 changesets with 10 changes to 1 files
				(run 'hg update' to get a working copy)

				see the result

				$ wait
				$ hg verify
				checking changesets
				checking manifests
				crosschecking files in changesets and manifests
				checking files
				1 files, 11 changesets, 11 total revisions

				$ cd ..