author | Pierre-Yves David <pierre-yves.david@octobus.net> |
Wed, 23 Oct 2019 01:11:13 +0200 | |
branch | mercurial-5.1 |
changeset 4905 | f3e39a354378 |
parent 4903 | 86b3efd4303e |
permissions | -rw-r--r-- |
3235
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
1 |
Testing the config option for rejecting draft changeset without topic |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
2 |
The config option is "experimental.topic-mode.server" |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
3 |
|
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
4 |
$ . "$TESTDIR/testlib/topic_setup.sh" |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
5 |
|
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
6 |
Creating a server repo |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
7 |
|
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
8 |
$ hg init server |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
9 |
$ cd server |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
10 |
$ cat <<EOF >>.hg/hgrc |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
11 |
> [phases] |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
12 |
> publish=False |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
13 |
> [experimental] |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
14 |
> topic-mode.server = enforce |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
15 |
> EOF |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
16 |
|
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
17 |
$ hg topic server |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
18 |
marked working directory as topic: server |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
19 |
$ for ch in a b c; do echo foo > $ch; hg ci -Aqm "Added "$ch; done |
3280
e642bad8174a
test: publish the root of the repo in flow reject-untopiced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3235
diff
changeset
|
20 |
$ hg ph -p 0 |
3235
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
21 |
|
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
22 |
$ hg log -G -T "{rev}:{node|short}\n{desc} {topics}" |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
23 |
@ 2:a7b96f87a214 |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
24 |
| Added c server |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
25 |
o 1:d6a8197e192a |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
26 |
| Added b server |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
27 |
o 0:49a3f206c9ae |
3280
e642bad8174a
test: publish the root of the repo in flow reject-untopiced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3235
diff
changeset
|
28 |
Added a |
3235
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
29 |
|
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
30 |
$ cd .. |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
31 |
|
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
32 |
Creating a client repo |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
33 |
|
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
34 |
$ hg clone server client |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
35 |
updating to branch default |
3280
e642bad8174a
test: publish the root of the repo in flow reject-untopiced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3235
diff
changeset
|
36 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
e642bad8174a
test: publish the root of the repo in flow reject-untopiced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3235
diff
changeset
|
37 |
$ cd client |
e642bad8174a
test: publish the root of the repo in flow reject-untopiced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3235
diff
changeset
|
38 |
$ hg up server |
3235
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
39 |
switching to topic server |
3280
e642bad8174a
test: publish the root of the repo in flow reject-untopiced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3235
diff
changeset
|
40 |
2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
3235
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
41 |
$ hg log -G -T "{rev}:{node|short}\n{desc} {topics}" |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
42 |
@ 2:a7b96f87a214 |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
43 |
| Added c server |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
44 |
o 1:d6a8197e192a |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
45 |
| Added b server |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
46 |
o 0:49a3f206c9ae |
3280
e642bad8174a
test: publish the root of the repo in flow reject-untopiced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3235
diff
changeset
|
47 |
Added a |
3235
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
48 |
|
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
49 |
$ hg topic |
3280
e642bad8174a
test: publish the root of the repo in flow reject-untopiced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3235
diff
changeset
|
50 |
* server (2 changesets) |
3235
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
51 |
|
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
52 |
Create a changeset without topic |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
53 |
|
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
54 |
$ hg topic --clear |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
55 |
$ echo foo > d |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
56 |
$ hg ci -Aqm "added d" |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
57 |
|
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
58 |
$ hg log -G -T "{rev}:{node|short}\n{desc} {topics}" |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
59 |
@ 3:4e8b0e0237c6 |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
60 |
| added d |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
61 |
o 2:a7b96f87a214 |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
62 |
| Added c server |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
63 |
o 1:d6a8197e192a |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
64 |
| Added b server |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
65 |
o 0:49a3f206c9ae |
3280
e642bad8174a
test: publish the root of the repo in flow reject-untopiced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3235
diff
changeset
|
66 |
Added a |
3235
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
67 |
|
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
68 |
Push a draft changeset without topic |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
69 |
|
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
70 |
$ hg push ../server --new-branch |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
71 |
pushing to ../server |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
72 |
searching for changes |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
73 |
adding changesets |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
74 |
adding manifests |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
75 |
adding file changes |
4905
f3e39a354378
branching: merge the stable branch with the mercurial-5.1 branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4903
diff
changeset
|
76 |
added 1 changesets with 1 changes to 1 files |
3235
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
77 |
transaction abort! |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
78 |
rollback completed |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
79 |
abort: rejecting draft changesets: 4e8b0e0237 |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
80 |
[255] |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
81 |
|
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
82 |
$ hg push ../server -f |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
83 |
pushing to ../server |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
84 |
searching for changes |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
85 |
adding changesets |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
86 |
adding manifests |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
87 |
adding file changes |
4905
f3e39a354378
branching: merge the stable branch with the mercurial-5.1 branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4903
diff
changeset
|
88 |
added 1 changesets with 1 changes to 1 files |
3235
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
89 |
transaction abort! |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
90 |
rollback completed |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
91 |
abort: rejecting draft changesets: 4e8b0e0237 |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
92 |
[255] |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
93 |
|
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
94 |
Grow the stack with more changesets having topic |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
95 |
|
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
96 |
$ hg topic client |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
97 |
marked working directory as topic: client |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
98 |
$ for ch in e f g; do echo foo > $ch; hg ci -Aqm "Added "$ch; done; |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
99 |
|
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
100 |
$ hg log -G -T "{rev}:{node|short}\n{desc} {topics}" |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
101 |
@ 6:42c4ac86452a |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
102 |
| Added g client |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
103 |
o 5:3dc456efb491 |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
104 |
| Added f client |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
105 |
o 4:18a516babc60 |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
106 |
| Added e client |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
107 |
o 3:4e8b0e0237c6 |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
108 |
| added d |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
109 |
o 2:a7b96f87a214 |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
110 |
| Added c server |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
111 |
o 1:d6a8197e192a |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
112 |
| Added b server |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
113 |
o 0:49a3f206c9ae |
3280
e642bad8174a
test: publish the root of the repo in flow reject-untopiced
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3235
diff
changeset
|
114 |
Added a |
3235
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
115 |
|
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
116 |
Pushing multiple changeset with some having topics and some not |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
117 |
|
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
118 |
$ hg push ../server --new-branch |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
119 |
pushing to ../server |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
120 |
searching for changes |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
121 |
adding changesets |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
122 |
adding manifests |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
123 |
adding file changes |
4905
f3e39a354378
branching: merge the stable branch with the mercurial-5.1 branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4903
diff
changeset
|
124 |
added 4 changesets with 4 changes to 4 files |
3235
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
125 |
transaction abort! |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
126 |
rollback completed |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
127 |
abort: rejecting draft changesets: 4e8b0e0237 |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
128 |
[255] |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
129 |
|
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
130 |
Testing case when both experimental.topic-mode.server and |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
131 |
experimental.topic.publish-bare-branch are set |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
132 |
|
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
133 |
$ cd ../server |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
134 |
$ echo 'topic.publish-bare-branch=True' >> .hg/hgrc |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
135 |
$ cd ../client |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
136 |
$ hg push ../server --new-branch |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
137 |
pushing to ../server |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
138 |
searching for changes |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
139 |
adding changesets |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
140 |
adding manifests |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
141 |
adding file changes |
4905
f3e39a354378
branching: merge the stable branch with the mercurial-5.1 branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4903
diff
changeset
|
142 |
added 4 changesets with 4 changes to 4 files |
3235
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
143 |
transaction abort! |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
144 |
rollback completed |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
145 |
abort: rejecting draft changesets: 4e8b0e0237 |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
146 |
[255] |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
147 |
|
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
148 |
Turning the changeset public and testing push |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
149 |
|
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
150 |
$ hg phase -r 3 -p |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
151 |
$ hg log -G -T "{rev}:{node|short}\n{desc} {topics}" |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
152 |
@ 6:42c4ac86452a |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
153 |
| Added g client |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
154 |
o 5:3dc456efb491 |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
155 |
| Added f client |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
156 |
o 4:18a516babc60 |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
157 |
| Added e client |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
158 |
o 3:4e8b0e0237c6 |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
159 |
| added d |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
160 |
o 2:a7b96f87a214 |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
161 |
| Added c |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
162 |
o 1:d6a8197e192a |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
163 |
| Added b |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
164 |
o 0:49a3f206c9ae |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
165 |
Added a |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
166 |
|
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
167 |
$ hg push ../server |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
168 |
pushing to ../server |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
169 |
searching for changes |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
170 |
adding changesets |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
171 |
adding manifests |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
172 |
adding file changes |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
173 |
added 4 changesets with 4 changes to 4 files |
8a772f0c54d9
topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
174 |
active topic 'server' is now empty |