upstream/mercurial-mirror Files · tests/test-rename-after-merge.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-rename-after-merge.t
        
                    121 lines
            
             | 2.2 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-rename-after-merge.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Martin Geisler
    
tests: added a short description to issue numbers...

              r12399
            
      Issue746: renaming files brought by the second parent of a merge was

      broken.

        Adrian Buehlmann
    
combine tests

              r12279
            
      Create source repository:

        $ hg init t

        $ cd t

        $ echo a > a

        $ hg ci -Am a

        adding a

        $ cd ..

      Fork source repository:

        $ hg clone t t2

        updating to branch default

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

        $ cd t2

        $ echo b > b

        $ hg ci -Am b

        adding b

      Update source repository:

        $ cd ../t

        $ echo a >> a

        $ hg ci -m a2

      Merge repositories:

        $ hg pull ../t2

        pulling from ../t2

        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)

        $ hg merge

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

        (branch merge, don't forget to commit)

        $ hg st

        M b

      Rename b as c:

        $ hg mv b c

        $ hg st

        A c

        R b

      Rename back c as b:

        $ hg mv c b

        $ hg st

        M b

        $ cd ..

        Martin Geisler
    
tests: added a short description to issue numbers...

              r12399
            
      Issue 1476: renaming a first parent file into another first parent

      file while none of them belong to the second parent was broken

        Adrian Buehlmann
    
combine tests

              r12279
            
        $ hg init repo1476

        $ cd repo1476

        $ echo a > a

        $ hg ci -Am adda

        adding a

        $ echo b1 > b1

        $ echo b2 > b2

        $ hg ci -Am changea

        adding b1

        adding b2

        $ hg up -C 0

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

        $ echo c1 > c1

        $ echo c2 > c2

        $ hg ci -Am addcandd

        adding c1

        adding c2

        created new head

      Merge heads:

        $ hg merge

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

        (branch merge, don't forget to commit)

        $ hg mv -Af c1 c2

      Commit issue 1476:

        $ hg ci -m merge

        $ hg log -r tip -C -v | grep copies

        copies:      c2 (c1)

        $ hg rollback

        Gilles Moris
    
rollback: clarifies the message about the reverted state (issue2628)...

              r13446
            
        repository tip rolled back to revision 2 (undo commit)

        Wagner Bruna
    
rollback, i18n: avoid parameterized message

              r13455
            
        working directory now based on revisions 2 and 1

        Adrian Buehlmann
    
combine tests

              r12279
            
        $ hg up -C .

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

      Merge heads again:

        $ hg merge

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

        (branch merge, don't forget to commit)

        $ hg mv -Af b1 b2

      Commit issue 1476 with a rename on the other side:

        $ hg ci -m merge

        $ hg log -r tip -C -v | grep copies

        copies:      b2 (b1)

        Mads Kiilerich
    
tests: add missing trailing 'cd ..'...

              r16913
            
        $ 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

Martin Geisler tests: added a short description to issue numbers...	r12399	Issue746: renaming files brought by the second parent of a merge was
		broken.
Adrian Buehlmann combine tests	r12279
		Create source repository:

		$ hg init t
		$ cd t
		$ echo a > a
		$ hg ci -Am a
		adding a
		$ cd ..

		Fork source repository:

		$ hg clone t t2
		updating to branch default
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		$ cd t2
		$ echo b > b
		$ hg ci -Am b
		adding b

		Update source repository:

		$ cd ../t
		$ echo a >> a
		$ hg ci -m a2

		Merge repositories:

		$ hg pull ../t2
		pulling from ../t2
		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)

		$ hg merge
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		(branch merge, don't forget to commit)

		$ hg st
		M b

		Rename b as c:

		$ hg mv b c
		$ hg st
		A c
		R b

		Rename back c as b:

		$ hg mv c b
		$ hg st
		M b

		$ cd ..

Martin Geisler tests: added a short description to issue numbers...	r12399	Issue 1476: renaming a first parent file into another first parent
		file while none of them belong to the second parent was broken
Adrian Buehlmann combine tests	r12279
		$ hg init repo1476
		$ cd repo1476
		$ echo a > a
		$ hg ci -Am adda
		adding a
		$ echo b1 > b1
		$ echo b2 > b2
		$ hg ci -Am changea
		adding b1
		adding b2
		$ hg up -C 0
		0 files updated, 0 files merged, 2 files removed, 0 files unresolved
		$ echo c1 > c1
		$ echo c2 > c2
		$ hg ci -Am addcandd
		adding c1
		adding c2
		created new head

		Merge heads:

		$ hg merge
		2 files updated, 0 files merged, 0 files removed, 0 files unresolved
		(branch merge, don't forget to commit)

		$ hg mv -Af c1 c2

		Commit issue 1476:

		$ hg ci -m merge

		$ hg log -r tip -C -v \| grep copies
		copies: c2 (c1)

		$ hg rollback
Gilles Moris rollback: clarifies the message about the reverted state (issue2628)...	r13446	repository tip rolled back to revision 2 (undo commit)
Wagner Bruna rollback, i18n: avoid parameterized message	r13455	working directory now based on revisions 2 and 1
Adrian Buehlmann combine tests	r12279
		$ hg up -C .
		2 files updated, 0 files merged, 2 files removed, 0 files unresolved

		Merge heads again:

		$ hg merge
		2 files updated, 0 files merged, 0 files removed, 0 files unresolved
		(branch merge, don't forget to commit)

		$ hg mv -Af b1 b2

		Commit issue 1476 with a rename on the other side:

		$ hg ci -m merge

		$ hg log -r tip -C -v \| grep copies
		copies: b2 (b1)

Mads Kiilerich tests: add missing trailing 'cd ..'...	r16913	$ cd ..