upstream/mercurial-mirror Files · tests/test-obsolete-changeset-exchange.t

strip: move bookmarks to nearest ancestor rather than '.'...

strip: move bookmarks to nearest ancestor rather than '.' If you've got this graph: 0-1-2 \ 3 and 3 is checked out, 2 is bookmarked with "broken", and you do "hg strip 2", the bookmark will move to 3, not 1. That's always struck me as a bug. This change makes bookmarks move to the tipmost ancestor of the stripped set rather than the currently-checked-out revision, which is what I always expected should happen.

Patrick Mezard - - Load All Authors

File last commit:

r17248:6ffb35b2 stable


                r17264:ec7b9bec

stable

Download file

             test-obsolete-changeset-exchange.t
        
                    48 lines
            
             | 1.2 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-obsolete-changeset-exchange.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      Test changesets filtering during exchanges (some tests are still in

      test-obsolete.t)

      Push does corrupt remote

      ------------------------

      Create a DAG where a changeset reuses a revision from a file first used in an

      extinct changeset.

        $ hg init local

        $ cd local

        $ echo 'base' > base

        $ hg commit -Am base

        adding base

        $ echo 'A' > A

        $ hg commit -Am A

        adding A

        $ hg up 0

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

        $ hg revert -ar 1

        adding A

        $ hg commit -Am "A'"

        created new head

        $ hg log -G --template='{desc} {node}'

        @  A' f89bcc95eba5174b1ccc3e33a82e84c96e8338ee

        |

        | o  A 9d73aac1b2ed7d53835eaeec212ed41ea47da53a

        |/

        o  base d20a80d4def38df63a4b330b7fb688f3d4cae1e3

        $ hg debugobsolete 9d73aac1b2ed7d53835eaeec212ed41ea47da53a f89bcc95eba5174b1ccc3e33a82e84c96e8338ee

      Push it. The bundle should not refer to the extinct changeset.

        $ hg init ../other

        $ hg push ../other

        pushing to ../other

        searching for changes

        adding changesets

        adding manifests

        adding file changes

        added 2 changesets with 2 changes to 2 files

        $ hg -R ../other verify

        checking changesets

        checking manifests

        crosschecking files in changesets and manifests

        checking files

        2 files, 2 changesets, 2 total revisions

	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

				Test changesets filtering during exchanges (some tests are still in
				test-obsolete.t)

				Push does corrupt remote
				------------------------

				Create a DAG where a changeset reuses a revision from a file first used in an
				extinct changeset.

				$ hg init local
				$ cd local
				$ echo 'base' > base
				$ hg commit -Am base
				adding base
				$ echo 'A' > A
				$ hg commit -Am A
				adding A
				$ hg up 0
				0 files updated, 0 files merged, 1 files removed, 0 files unresolved
				$ hg revert -ar 1
				adding A
				$ hg commit -Am "A'"
				created new head
				$ hg log -G --template='{desc} {node}'
				@ A' f89bcc95eba5174b1ccc3e33a82e84c96e8338ee
				\|
				\| o A 9d73aac1b2ed7d53835eaeec212ed41ea47da53a
				\|/
				o base d20a80d4def38df63a4b330b7fb688f3d4cae1e3

				$ hg debugobsolete 9d73aac1b2ed7d53835eaeec212ed41ea47da53a f89bcc95eba5174b1ccc3e33a82e84c96e8338ee

				Push it. The bundle should not refer to the extinct changeset.

				$ hg init ../other
				$ hg push ../other
				pushing to ../other
				searching for changes
				adding changesets
				adding manifests
				adding file changes
				added 2 changesets with 2 changes to 2 files
				$ hg -R ../other verify
				checking changesets
				checking manifests
				crosschecking files in changesets and manifests
				checking files
				2 files, 2 changesets, 2 total revisions