evolve: tests/test-topic-push.t annotate

annotate tests/test-topic-push.t @ 1886:0504e76bfbd9

push: allow pushing new topic to non-publishing server by default This improves and fix the behavior change introduced by the new "topicmap". * Topics are properly ignored when pushing to a publishing server, * pushing new topics is allowed without --force a non-publishing server, * Pushing extra heads on a topic requires --force. Create of new head on a branch by phase movement is not properly detected for now. We'll improve that part in a later changesets. There is more awful monkey patching going on. We'll have to refactor core to get rid of them.

author	Pierre-Yves David <pierre-yves.david@fb.com>
date	Sat, 12 Mar 2016 18:19:27 +0000
parents
children	68125d026b07

rev	line source
1886 0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	1 $ . "$TESTDIR/testlib"
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	2
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	3 $ cat << EOF >> $HGRCPATH
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	4 > [ui]
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	5 > logtemplate = {rev} {branch} {get(namespaces, "topics")} {phase} {desc\|firstline}\n
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	6 > [ui]
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	7 > ssh =python "$RUNTESTDIR/dummyssh"
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	8 > EOF
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	9
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	10 $ hg init main
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	11 $ hg init draft
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	12 $ cat << EOF >> draft/.hg/hgrc
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	13 > [phases]
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	14 > publish=False
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	15 > EOF
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	16 $ hg clone main client
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	17 updating to branch default
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	18 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	19 $ cat << EOF >> client/.hg/hgrc
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	20 > [paths]
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	21 > draft=../draft
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	22 > EOF
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	23
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	24
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	25 Testing core behavior to make sure we did not break anything
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	26 ============================================================
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	27
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	28 Pushing a first changeset
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	29
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	30 $ cd client
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	31 $ echo aaa > aaa
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	32 $ hg add aaa
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	33 $ hg commit -m 'CA'
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	34 $ hg outgoing -G
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	35 comparing with $TESTTMP/main
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	36 searching for changes
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	37 @ 0 default draft CA
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	38
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	39 $ hg push
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	40 pushing to $TESTTMP/main
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	41 searching for changes
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	42 adding changesets
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	43 adding manifests
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	44 adding file changes
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	45 added 1 changesets with 1 changes to 1 files
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	46
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	47 Pushing two heads
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	48
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	49 $ echo aaa > bbb
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	50 $ hg add bbb
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	51 $ hg commit -m 'CB'
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	52 $ echo aaa > ccc
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	53 $ hg up 'desc(CA)'
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	54 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	55 $ hg add ccc
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	56 $ hg commit -m 'CC'
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	57 created new head
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	58 $ hg outgoing -G
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	59 comparing with $TESTTMP/main
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	60 searching for changes
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	61 @ 2 default draft CC
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	62
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	63 o 1 default draft CB
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	64
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	65 $ hg push
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	66 pushing to $TESTTMP/main
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	67 searching for changes
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	68 abort: push creates new remote head 9fe81b7f425d!
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	69 (merge or see "hg help push" for details about pushing new heads)
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	70 [255]
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	71 $ hg outgoing -r 'desc(CB)' -G
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	72 comparing with $TESTTMP/main
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	73 searching for changes
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	74 o 1 default draft CB
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	75
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	76 $ hg push -r 'desc(CB)'
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	77 pushing to $TESTTMP/main
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	78 searching for changes
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	79 adding changesets
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	80 adding manifests
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	81 adding file changes
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	82 added 1 changesets with 1 changes to 1 files
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	83
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	84 Pushing a new branch
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	85
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	86 $ hg branch mountain
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	87 marked working directory as branch mountain
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	88 (branches are permanent and global, did you want a bookmark?)
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	89 $ hg commit --amend
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	90 $ hg outgoing -G
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	91 comparing with $TESTTMP/main
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	92 searching for changes
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	93 @ 4 mountain draft CC
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	94
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	95 $ hg push
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	96 pushing to $TESTTMP/main
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	97 searching for changes
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	98 abort: push creates new remote branches: mountain!
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	99 (use 'hg push --new-branch' to create new remote branches)
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	100 [255]
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	101 $ hg push --new-branch
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	102 pushing to $TESTTMP/main
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	103 searching for changes
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	104 adding changesets
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	105 adding manifests
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	106 adding file changes
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	107 added 1 changesets with 1 changes to 1 files (+1 heads)
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	108 2 new obsolescence markers
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	109
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	110 Including on non-publishing
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	111
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	112 $ hg push --new-branch draft
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	113 pushing to $TESTTMP/draft
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	114 searching for changes
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	115 adding changesets
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	116 adding manifests
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	117 adding file changes
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	118 added 3 changesets with 3 changes to 3 files (+1 heads)
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	119 2 new obsolescence markers
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	120
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	121 Testing topic behavior
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	122 ======================
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	123
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	124 Local peer tests
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	125 ----------------
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	126
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	127 $ hg up -r 'desc(CA)'
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	128 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	129 $ hg topic babar
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	130 $ echo aaa > ddd
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	131 $ hg add ddd
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	132 $ hg commit -m 'CD'
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	133 created new head
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	134 $ hg log -G # keep track of phase because I saw some strange bug during developement
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	135 @ 5 default babar draft CD
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	136 \|
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	137 \| o 4 mountain public CC
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	138 \|/
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	139 \| o 1 default public CB
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	140 \|/
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	141 o 0 default public CA
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	142
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	143
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	144 Pushing a new topic to a non publishing server should not be seen as a new head
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	145
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	146 $ hg push draft
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	147 pushing to $TESTTMP/draft
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	148 searching for changes
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	149 adding changesets
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	150 adding manifests
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	151 adding file changes
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	152 added 1 changesets with 1 changes to 1 files (+1 heads)
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	153 $ hg log -G
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	154 @ 5 default babar draft CD
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	155 \|
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	156 \| o 4 mountain public CC
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	157 \|/
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	158 \| o 1 default public CB
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	159 \|/
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	160 o 0 default public CA
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	161
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	162
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	163 Pushing a new topic to a publishing server should be seen as a new head
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	164
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	165 $ hg push
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	166 pushing to $TESTTMP/main
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	167 searching for changes
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	168 abort: push creates new remote head 67f579af159d!
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	169 (merge or see "hg help push" for details about pushing new heads)
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	170 [255]
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	171 $ hg log -G
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	172 @ 5 default babar draft CD
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	173 \|
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	174 \| o 4 mountain public CC
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	175 \|/
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	176 \| o 1 default public CB
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	177 \|/
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	178 o 0 default public CA
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	179
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	180
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	181 wireprotocol tests
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	182 ------------------
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	183
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	184 $ hg up -r 'desc(CA)'
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	185 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	186 $ hg topic celeste
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	187 $ echo aaa > eee
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	188 $ hg add eee
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	189 $ hg commit -m 'CE'
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	190 created new head
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	191 $ hg log -G # keep track of phase because I saw some strange bug during developement
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	192 @ 6 default celeste draft CE
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	193 \|
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	194 \| o 5 default babar draft CD
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	195 \|/
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	196 \| o 4 mountain public CC
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	197 \|/
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	198 \| o 1 default public CB
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	199 \|/
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	200 o 0 default public CA
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	201
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	202
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	203 Pushing a new topic to a non publishing server should not be seen as a new head
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	204
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	205 $ hg push ssh://user@dummy/draft
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	206 pushing to ssh://user@dummy/draft
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	207 searching for changes
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	208 remote: adding changesets
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	209 remote: adding manifests
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	210 remote: adding file changes
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	211 remote: added 1 changesets with 1 changes to 1 files (+1 heads)
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	212 $ hg log -G
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	213 @ 6 default celeste draft CE
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	214 \|
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	215 \| o 5 default babar draft CD
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	216 \|/
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	217 \| o 4 mountain public CC
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	218 \|/
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	219 \| o 1 default public CB
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	220 \|/
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	221 o 0 default public CA
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	222
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	223
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	224 Pushing a new topic to a publishing server should be seen as a new head
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	225
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	226 $ hg push ssh://user@dummy/main
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	227 pushing to ssh://user@dummy/main
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	228 searching for changes
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	229 abort: push creates new remote head 67f579af159d!
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	230 (merge or see "hg help push" for details about pushing new heads)
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	231 [255]
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	232 $ hg log -G
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	233 @ 6 default celeste draft CE
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	234 \|
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	235 \| o 5 default babar draft CD
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	236 \|/
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	237 \| o 4 mountain public CC
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	238 \|/
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	239 \| o 1 default public CB
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	240 \|/
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	241 o 0 default public CA
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	242
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	243
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	244 Check that we reject multiple head on the same topic
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	245 ----------------------------------------------------
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	246
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	247 $ hg up 'desc(CB)'
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	248 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	249 $ hg topic babar
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	250 $ echo aaa > fff
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	251 $ hg add fff
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	252 $ hg commit -m 'CF'
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	253 $ hg log -G
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	254 @ 7 default babar draft CF
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	255 \|
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	256 \| o 6 default celeste draft CE
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	257 \| \|
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	258 \| \| o 5 default babar draft CD
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	259 \| \|/
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	260 \| \| o 4 mountain public CC
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	261 \| \|/
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	262 o \| 1 default public CB
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	263 \|/
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	264 o 0 default public CA
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	265
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	266
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	267 $ hg push draft
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	268 pushing to $TESTTMP/draft
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	269 searching for changes
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	270 abort: push creates new remote head f0bc62a661be on branch 'default:babar'!
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	271 (merge or see "hg help push" for details about pushing new heads)
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	272 [255]
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	273
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	274 Multiple head on a branch merged in a topic changesets
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	275 ------------------------------------------------------------------------
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	276
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	277
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	278 $ hg up 'desc(CA)'
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	279 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	280 $ echo aaa > ggg
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	281 $ hg add ggg
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	282 $ hg commit -m 'CG'
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	283 created new head
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	284 $ hg up 'desc(CF)'
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	285 switching to topic babar
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	286 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	287 $ hg merge 'desc(CG)'
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	288 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	289 (branch merge, don't forget to commit)
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	290 $ hg commit -m 'CM'
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	291 $ hg log -G
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	292 @ 9 default babar draft CM
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	293 \|\
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	294 \| o 8 default draft CG
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	295 \| \|
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	296 o \| 7 default babar draft CF
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	297 \| \|
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	298 \| \| o 6 default celeste draft CE
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	299 \| \|/
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	300 \| \| o 5 default babar draft CD
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	301 \| \|/
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	302 \| \| o 4 mountain public CC
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	303 \| \|/
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	304 o \| 1 default public CB
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	305 \|/
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	306 o 0 default public CA
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	307
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	308
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	309 Reject when pushing to draft
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	310
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	311 $ hg push draft -r .
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	312 pushing to $TESTTMP/draft
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	313 searching for changes
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	314 abort: push creates new remote head 4937c4cad39e!
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	315 (merge or see "hg help push" for details about pushing new heads)
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	316 [255]
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	317
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	318
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	319 Reject when pushing to publishing
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	320
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	321 $ hg push -r .
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	322 pushing to $TESTTMP/main
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	323 searching for changes
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	324 adding changesets
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	325 adding manifests
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	326 adding file changes
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	327 added 3 changesets with 2 changes to 2 files
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	328
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	329 $ cd ..
0504e76bfbd9 push: allow pushing new topic to non-publishing server by default Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	330

Mercurial > evolve

annotate tests/test-topic-push.t @ 1886:0504e76bfbd9