upstream/mercurial-mirror Files · tests/test-rebase-check-restore.t

clone: do not turn hidden changeset public on publishing clone (issue3935)...

clone: do not turn hidden changeset public on publishing clone (issue3935) Before this changeset local clone of a repo with hidden changeset would include then in the clone (why not) and turn them public (plain wrong). This happened because the copy clone publish by dropping the phaseroot file entirely making everything in the repo public (and therefore immune to obsolescence marker). This changeset takes the simplest fix, we deny the copy clone in the case of hidden changeset falling back to pull clone that will exclude them from the clone and therefore not turning them public. A smarter version of copy clone could be done, but I prefer to go for the simplest solution first.

Martin Geisler - - Load All Authors

File last commit:

r20117:aa9385f9 default


                r20332:a959f716

stable

Download file

             test-rebase-check-restore.t
        
                    149 lines
            
             | 2.3 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-rebase-check-restore.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ cat >> $HGRCPATH <<EOF

        > [extensions]

        > rebase=

        > 

        > [phases]

        > publish=False

        > 

        > [alias]

        > tglog = log -G --template "{rev}:{phase} '{desc}' {branches}\n"

        > EOF

        $ hg init a

        $ cd a

        $ echo A > A

        $ hg add A

        $ hg ci -m A

        $ echo 'B' > B

        $ hg add B

        $ hg ci -m B

        $ echo C >> A

        $ hg ci -m C

        $ hg up -q -C 0

        $ echo D >> A

        $ hg ci -m D

        created new head

        $ echo E > E

        $ hg add E

        $ hg ci -m E

        $ hg up -q -C 0

        $ hg branch 'notdefault'

        marked working directory as branch notdefault

        (branches are permanent and global, did you want a bookmark?)

        $ echo F >> A

        $ hg ci -m F

        $ cd ..

      Rebasing B onto E - check keep: and phases

        $ hg clone -q -u . a a1

        $ cd a1

        $ hg phase --force --secret 2

        $ hg tglog

        @  5:draft 'F' notdefault

        |

        | o  4:draft 'E'

        | |

        | o  3:draft 'D'

        |/

        | o  2:secret 'C'

        | |

        | o  1:draft 'B'

        |/

        o  0:draft 'A'

        $ hg rebase -s 1 -d 4 --keep

        merging A

        warning: conflicts during merge.

        merging A incomplete! (edit conflicts, then use 'hg resolve --mark')

        unresolved conflicts (see hg resolve, then hg rebase --continue)

        [1]

      Solve the conflict and go on:

        $ echo 'conflict solved' > A

        $ rm A.orig

        $ hg resolve -m A

        $ hg rebase --continue

        $ hg tglog

        o  7:secret 'C'

        |

        o  6:draft 'B'

        |

        | @  5:draft 'F' notdefault

        | |

        o |  4:draft 'E'

        | |

        o |  3:draft 'D'

        |/

        | o  2:secret 'C'

        | |

        | o  1:draft 'B'

        |/

        o  0:draft 'A'

        $ cd ..

      Rebase F onto E - check keepbranches:

        $ hg clone -q -u . a a2

        $ cd a2

        $ hg phase --force --secret 2

        $ hg tglog

        @  5:draft 'F' notdefault

        |

        | o  4:draft 'E'

        | |

        | o  3:draft 'D'

        |/

        | o  2:secret 'C'

        | |

        | o  1:draft 'B'

        |/

        o  0:draft 'A'

        $ hg rebase -s 5 -d 4 --keepbranches

        merging A

        warning: conflicts during merge.

        merging A incomplete! (edit conflicts, then use 'hg resolve --mark')

        unresolved conflicts (see hg resolve, then hg rebase --continue)

        [1]

      Solve the conflict and go on:

        $ echo 'conflict solved' > A

        $ rm A.orig

        $ hg resolve -m A

        $ hg rebase --continue

        saved backup bundle to $TESTTMP/a2/.hg/strip-backup/*-backup.hg (glob)

        $ hg tglog

        @  5:draft 'F' notdefault

        |

        o  4:draft 'E'

        |

        o  3:draft 'D'

        |

        | o  2:secret 'C'

        | |

        | o  1:draft 'B'

        |/

        o  0:draft 'A'

        $ 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

				$ cat >> $HGRCPATH <<EOF
				> [extensions]
				> rebase=
				>
				> [phases]
				> publish=False
				>
				> [alias]
				> tglog = log -G --template "{rev}:{phase} '{desc}' {branches}\n"
				> EOF


				$ hg init a
				$ cd a

				$ echo A > A
				$ hg add A
				$ hg ci -m A

				$ echo 'B' > B
				$ hg add B
				$ hg ci -m B

				$ echo C >> A
				$ hg ci -m C

				$ hg up -q -C 0

				$ echo D >> A
				$ hg ci -m D
				created new head

				$ echo E > E
				$ hg add E
				$ hg ci -m E

				$ hg up -q -C 0

				$ hg branch 'notdefault'
				marked working directory as branch notdefault
				(branches are permanent and global, did you want a bookmark?)
				$ echo F >> A
				$ hg ci -m F

				$ cd ..


				Rebasing B onto E - check keep: and phases

				$ hg clone -q -u . a a1
				$ cd a1
				$ hg phase --force --secret 2

				$ hg tglog
				@ 5:draft 'F' notdefault
				\|
				\| o 4:draft 'E'
				\| \|
				\| o 3:draft 'D'
				\|/
				\| o 2:secret 'C'
				\| \|
				\| o 1:draft 'B'
				\|/
				o 0:draft 'A'

				$ hg rebase -s 1 -d 4 --keep
				merging A
				warning: conflicts during merge.
				merging A incomplete! (edit conflicts, then use 'hg resolve --mark')
				unresolved conflicts (see hg resolve, then hg rebase --continue)
				[1]

				Solve the conflict and go on:

				$ echo 'conflict solved' > A
				$ rm A.orig
				$ hg resolve -m A
				$ hg rebase --continue

				$ hg tglog
				o 7:secret 'C'
				\|
				o 6:draft 'B'
				\|
				\| @ 5:draft 'F' notdefault
				\| \|
				o \| 4:draft 'E'
				\| \|
				o \| 3:draft 'D'
				\|/
				\| o 2:secret 'C'
				\| \|
				\| o 1:draft 'B'
				\|/
				o 0:draft 'A'

				$ cd ..


				Rebase F onto E - check keepbranches:

				$ hg clone -q -u . a a2
				$ cd a2
				$ hg phase --force --secret 2

				$ hg tglog
				@ 5:draft 'F' notdefault
				\|
				\| o 4:draft 'E'
				\| \|
				\| o 3:draft 'D'
				\|/
				\| o 2:secret 'C'
				\| \|
				\| o 1:draft 'B'
				\|/
				o 0:draft 'A'

				$ hg rebase -s 5 -d 4 --keepbranches
				merging A
				warning: conflicts during merge.
				merging A incomplete! (edit conflicts, then use 'hg resolve --mark')
				unresolved conflicts (see hg resolve, then hg rebase --continue)
				[1]

				Solve the conflict and go on:

				$ echo 'conflict solved' > A
				$ rm A.orig
				$ hg resolve -m A
				$ hg rebase --continue
				saved backup bundle to $TESTTMP/a2/.hg/strip-backup/*-backup.hg (glob)

				$ hg tglog
				@ 5:draft 'F' notdefault
				\|
				o 4:draft 'E'
				\|
				o 3:draft 'D'
				\|
				\| o 2:secret 'C'
				\| \|
				\| o 1:draft 'B'
				\|/
				o 0:draft 'A'


				$ cd ..