author | Georges Racinet <georges.racinet@octobus.net> |
Thu, 05 Dec 2019 20:41:23 +0100 | |
changeset 43847 | 49fa0b31ee1d |
parent 43734 | 88a306478556 |
child 46096 | 4d5e2fd53707 |
permissions | -rw-r--r-- |
35185
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1 |
===================== |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
2 |
Test workflow options |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
3 |
===================== |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
4 |
|
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
5 |
$ . "$TESTDIR/testlib/obsmarker-common.sh" |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
6 |
|
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
7 |
Test single head enforcing - Setup |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
8 |
============================================= |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
9 |
|
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
10 |
$ cat << EOF >> $HGRCPATH |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
11 |
> [experimental] |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
12 |
> evolution = all |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
13 |
> EOF |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
14 |
$ hg init single-head-server |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
15 |
$ cd single-head-server |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
16 |
$ cat <<EOF >> .hg/hgrc |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
17 |
> [phases] |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
18 |
> publish = no |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
19 |
> [experimental] |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
20 |
> single-head-per-branch = yes |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
21 |
> EOF |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
22 |
$ mkcommit ROOT |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
23 |
$ mkcommit c_dA0 |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
24 |
$ cd .. |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
25 |
|
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
26 |
$ hg clone single-head-server client |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
27 |
updating to branch default |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
28 |
2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
29 |
|
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
30 |
Test single head enforcing - with branch only |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
31 |
--------------------------------------------- |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
32 |
|
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
33 |
$ cd client |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
34 |
|
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
35 |
continuing the current defaultbranch |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
36 |
|
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
37 |
$ mkcommit c_dB0 |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
38 |
$ hg push |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35185
diff
changeset
|
39 |
pushing to $TESTTMP/single-head-server |
35185
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
40 |
searching for changes |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
41 |
adding changesets |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
42 |
adding manifests |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
43 |
adding file changes |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
44 |
added 1 changesets with 1 changes to 1 files |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
45 |
|
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
46 |
creating a new branch |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
47 |
|
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
48 |
$ hg up 'desc("ROOT")' |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
49 |
0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
50 |
$ hg branch branch_A |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
51 |
marked working directory as branch branch_A |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
52 |
(branches are permanent and global, did you want a bookmark?) |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
53 |
$ mkcommit c_aC0 |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
54 |
$ hg push --new-branch |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35185
diff
changeset
|
55 |
pushing to $TESTTMP/single-head-server |
35185
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
56 |
searching for changes |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
57 |
adding changesets |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
58 |
adding manifests |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
59 |
adding file changes |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
60 |
added 1 changesets with 1 changes to 1 files (+1 heads) |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
61 |
|
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
62 |
Create a new head on the default branch |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
63 |
|
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
64 |
$ hg up 'desc("c_dA0")' |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
65 |
1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
66 |
$ mkcommit c_dD0 |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
67 |
created new head |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
68 |
$ hg push -f |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35185
diff
changeset
|
69 |
pushing to $TESTTMP/single-head-server |
35185
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
70 |
searching for changes |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
71 |
adding changesets |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
72 |
adding manifests |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
73 |
adding file changes |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
74 |
transaction abort! |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
75 |
rollback completed |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
76 |
abort: rejecting multiple heads on branch "default" |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
77 |
(2 heads: 286d02a6e2a2 9bf953aa81f6) |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
78 |
[255] |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
79 |
|
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
80 |
remerge them |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
81 |
|
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
82 |
$ hg merge |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
83 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
84 |
(branch merge, don't forget to commit) |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
85 |
$ mkcommit c_dE0 |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
86 |
$ hg push |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35185
diff
changeset
|
87 |
pushing to $TESTTMP/single-head-server |
35185
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
88 |
searching for changes |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
89 |
adding changesets |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
90 |
adding manifests |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
91 |
adding file changes |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
92 |
added 2 changesets with 2 changes to 2 files |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
93 |
|
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
94 |
Test single head enforcing - after rewrite |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
95 |
------------------------------------------ |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
96 |
|
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
97 |
$ mkcommit c_dF0 |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
98 |
$ hg push |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35185
diff
changeset
|
99 |
pushing to $TESTTMP/single-head-server |
35185
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
100 |
searching for changes |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
101 |
adding changesets |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
102 |
adding manifests |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
103 |
adding file changes |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
104 |
added 1 changesets with 1 changes to 1 files |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
105 |
$ hg commit --amend -m c_dF1 |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
106 |
$ hg push |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35185
diff
changeset
|
107 |
pushing to $TESTTMP/single-head-server |
35185
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
108 |
searching for changes |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
109 |
adding changesets |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
110 |
adding manifests |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
111 |
adding file changes |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
112 |
added 1 changesets with 0 changes to 1 files (+1 heads) |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
113 |
1 new obsolescence markers |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
114 |
obsoleted 1 changesets |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
115 |
|
42967
3609ea82b971
singlehead: fix a small typo in a test comment
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42897
diff
changeset
|
116 |
Check it does not interfer with strip |
3609ea82b971
singlehead: fix a small typo in a test comment
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42897
diff
changeset
|
117 |
------------------------------------- |
35185
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
118 |
|
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
119 |
setup |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
120 |
|
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
121 |
$ hg branch branch_A --force |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
122 |
marked working directory as branch branch_A |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
123 |
$ mkcommit c_aG0 |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
124 |
created new head |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
125 |
$ hg update 'desc("c_dF1")' |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
126 |
0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
127 |
$ mkcommit c_dH0 |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
128 |
$ hg update 'desc("c_aG0")' |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
129 |
1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
130 |
$ hg merge |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
131 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
132 |
(branch merge, don't forget to commit) |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
133 |
$ mkcommit c_aI0 |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
134 |
$ hg log -G |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
135 |
@ changeset: 10:49003e504178 |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
136 |
|\ branch: branch_A |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
137 |
| | tag: tip |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
138 |
| | parent: 8:a33fb808fb4b |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
139 |
| | parent: 3:840af1c6bc88 |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
140 |
| | user: test |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
141 |
| | date: Thu Jan 01 00:00:00 1970 +0000 |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
142 |
| | summary: c_aI0 |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
143 |
| | |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
144 |
| | o changeset: 9:fe47ea669cea |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
145 |
| | | parent: 7:99a2dc242c5d |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
146 |
| | | user: test |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
147 |
| | | date: Thu Jan 01 00:00:00 1970 +0000 |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
148 |
| | | summary: c_dH0 |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
149 |
| | | |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
150 |
| o | changeset: 8:a33fb808fb4b |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
151 |
| |/ branch: branch_A |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
152 |
| | user: test |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
153 |
| | date: Thu Jan 01 00:00:00 1970 +0000 |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
154 |
| | summary: c_aG0 |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
155 |
| | |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
156 |
| o changeset: 7:99a2dc242c5d |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
157 |
| | parent: 5:6ed1df20edb1 |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
158 |
| | user: test |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
159 |
| | date: Thu Jan 01 00:00:00 1970 +0000 |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
160 |
| | summary: c_dF1 |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
161 |
| | |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
162 |
| o changeset: 5:6ed1df20edb1 |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
163 |
| |\ parent: 4:9bf953aa81f6 |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
164 |
| | | parent: 2:286d02a6e2a2 |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
165 |
| | | user: test |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
166 |
| | | date: Thu Jan 01 00:00:00 1970 +0000 |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
167 |
| | | summary: c_dE0 |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
168 |
| | | |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
169 |
| | o changeset: 4:9bf953aa81f6 |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
170 |
| | | parent: 1:134bc3852ad2 |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
171 |
| | | user: test |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
172 |
| | | date: Thu Jan 01 00:00:00 1970 +0000 |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
173 |
| | | summary: c_dD0 |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
174 |
| | | |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
175 |
o | | changeset: 3:840af1c6bc88 |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
176 |
| | | branch: branch_A |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
177 |
| | | parent: 0:ea207398892e |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
178 |
| | | user: test |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
179 |
| | | date: Thu Jan 01 00:00:00 1970 +0000 |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
180 |
| | | summary: c_aC0 |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
181 |
| | | |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
182 |
| o | changeset: 2:286d02a6e2a2 |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
183 |
| |/ user: test |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
184 |
| | date: Thu Jan 01 00:00:00 1970 +0000 |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
185 |
| | summary: c_dB0 |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
186 |
| | |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
187 |
| o changeset: 1:134bc3852ad2 |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
188 |
|/ user: test |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
189 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
190 |
| summary: c_dA0 |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
191 |
| |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
192 |
o changeset: 0:ea207398892e |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
193 |
user: test |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
194 |
date: Thu Jan 01 00:00:00 1970 +0000 |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
195 |
summary: ROOT |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
196 |
|
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
197 |
|
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
198 |
actual stripping |
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
199 |
|
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
200 |
$ hg strip --config extensions.strip= --rev 'desc("c_dH0")' |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35185
diff
changeset
|
201 |
saved backup bundle to $TESTTMP/client/.hg/strip-backup/fe47ea669cea-a41bf5a9-backup.hg |
35185
66ecde8a704d
server: introduce a 'experimental.single-head-per-branch' option
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
202 |
|
42969
76608f9f27f6
singlehead: introduce special handling of closed heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42967
diff
changeset
|
203 |
Test that closing heads are ignored by default |
76608f9f27f6
singlehead: introduce special handling of closed heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42967
diff
changeset
|
204 |
----------------------------------------------- |
76608f9f27f6
singlehead: introduce special handling of closed heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42967
diff
changeset
|
205 |
|
76608f9f27f6
singlehead: introduce special handling of closed heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42967
diff
changeset
|
206 |
$ hg up 'desc("c_aG0")' |
76608f9f27f6
singlehead: introduce special handling of closed heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42967
diff
changeset
|
207 |
0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
76608f9f27f6
singlehead: introduce special handling of closed heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42967
diff
changeset
|
208 |
$ mkcommit c_aJ0 |
76608f9f27f6
singlehead: introduce special handling of closed heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42967
diff
changeset
|
209 |
created new head |
76608f9f27f6
singlehead: introduce special handling of closed heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42967
diff
changeset
|
210 |
|
76608f9f27f6
singlehead: introduce special handling of closed heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42967
diff
changeset
|
211 |
pushing the new head should fails |
76608f9f27f6
singlehead: introduce special handling of closed heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42967
diff
changeset
|
212 |
|
76608f9f27f6
singlehead: introduce special handling of closed heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42967
diff
changeset
|
213 |
$ hg push -f |
76608f9f27f6
singlehead: introduce special handling of closed heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42967
diff
changeset
|
214 |
pushing to $TESTTMP/single-head-server |
76608f9f27f6
singlehead: introduce special handling of closed heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42967
diff
changeset
|
215 |
searching for changes |
76608f9f27f6
singlehead: introduce special handling of closed heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42967
diff
changeset
|
216 |
adding changesets |
76608f9f27f6
singlehead: introduce special handling of closed heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42967
diff
changeset
|
217 |
adding manifests |
76608f9f27f6
singlehead: introduce special handling of closed heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42967
diff
changeset
|
218 |
adding file changes |
76608f9f27f6
singlehead: introduce special handling of closed heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42967
diff
changeset
|
219 |
transaction abort! |
76608f9f27f6
singlehead: introduce special handling of closed heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42967
diff
changeset
|
220 |
rollback completed |
76608f9f27f6
singlehead: introduce special handling of closed heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42967
diff
changeset
|
221 |
abort: rejecting multiple heads on branch "branch_A" |
76608f9f27f6
singlehead: introduce special handling of closed heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42967
diff
changeset
|
222 |
(2 heads: 49003e504178 468bd81ccc5d) |
76608f9f27f6
singlehead: introduce special handling of closed heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42967
diff
changeset
|
223 |
[255] |
76608f9f27f6
singlehead: introduce special handling of closed heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42967
diff
changeset
|
224 |
|
76608f9f27f6
singlehead: introduce special handling of closed heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42967
diff
changeset
|
225 |
|
76608f9f27f6
singlehead: introduce special handling of closed heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42967
diff
changeset
|
226 |
closing the head and pushing should succeed |
76608f9f27f6
singlehead: introduce special handling of closed heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42967
diff
changeset
|
227 |
|
76608f9f27f6
singlehead: introduce special handling of closed heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42967
diff
changeset
|
228 |
$ mkcommit c_aK0 --close-branch |
76608f9f27f6
singlehead: introduce special handling of closed heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42967
diff
changeset
|
229 |
$ hg push -f |
76608f9f27f6
singlehead: introduce special handling of closed heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42967
diff
changeset
|
230 |
pushing to $TESTTMP/single-head-server |
76608f9f27f6
singlehead: introduce special handling of closed heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42967
diff
changeset
|
231 |
searching for changes |
76608f9f27f6
singlehead: introduce special handling of closed heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42967
diff
changeset
|
232 |
adding changesets |
76608f9f27f6
singlehead: introduce special handling of closed heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42967
diff
changeset
|
233 |
adding manifests |
76608f9f27f6
singlehead: introduce special handling of closed heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42967
diff
changeset
|
234 |
adding file changes |
76608f9f27f6
singlehead: introduce special handling of closed heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42967
diff
changeset
|
235 |
added 4 changesets with 4 changes to 4 files (-1 heads) |
76608f9f27f6
singlehead: introduce special handling of closed heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42967
diff
changeset
|
236 |
|
76608f9f27f6
singlehead: introduce special handling of closed heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42967
diff
changeset
|
237 |
|
76608f9f27f6
singlehead: introduce special handling of closed heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42967
diff
changeset
|
238 |
Test that closing heads can be explicitly accounted for |
76608f9f27f6
singlehead: introduce special handling of closed heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42967
diff
changeset
|
239 |
------------------------------------------------------- |
76608f9f27f6
singlehead: introduce special handling of closed heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42967
diff
changeset
|
240 |
|
76608f9f27f6
singlehead: introduce special handling of closed heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42967
diff
changeset
|
241 |
$ cat <<EOF >> $TESTTMP/single-head-server/.hg/hgrc |
76608f9f27f6
singlehead: introduce special handling of closed heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42967
diff
changeset
|
242 |
> [experimental] |
76608f9f27f6
singlehead: introduce special handling of closed heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42967
diff
changeset
|
243 |
> single-head-per-branch:account-closed-heads = yes |
76608f9f27f6
singlehead: introduce special handling of closed heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42967
diff
changeset
|
244 |
> EOF |
76608f9f27f6
singlehead: introduce special handling of closed heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42967
diff
changeset
|
245 |
|
76608f9f27f6
singlehead: introduce special handling of closed heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42967
diff
changeset
|
246 |
$ hg up 'desc("c_aG0")' |
76608f9f27f6
singlehead: introduce special handling of closed heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42967
diff
changeset
|
247 |
0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
76608f9f27f6
singlehead: introduce special handling of closed heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42967
diff
changeset
|
248 |
$ mkcommit c_aL0 |
76608f9f27f6
singlehead: introduce special handling of closed heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42967
diff
changeset
|
249 |
created new head |
76608f9f27f6
singlehead: introduce special handling of closed heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42967
diff
changeset
|
250 |
$ mkcommit c_aM0 --close-branch |
76608f9f27f6
singlehead: introduce special handling of closed heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42967
diff
changeset
|
251 |
$ hg push -f |
76608f9f27f6
singlehead: introduce special handling of closed heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42967
diff
changeset
|
252 |
pushing to $TESTTMP/single-head-server |
76608f9f27f6
singlehead: introduce special handling of closed heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42967
diff
changeset
|
253 |
searching for changes |
76608f9f27f6
singlehead: introduce special handling of closed heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42967
diff
changeset
|
254 |
adding changesets |
76608f9f27f6
singlehead: introduce special handling of closed heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42967
diff
changeset
|
255 |
adding manifests |
76608f9f27f6
singlehead: introduce special handling of closed heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42967
diff
changeset
|
256 |
adding file changes |
76608f9f27f6
singlehead: introduce special handling of closed heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42967
diff
changeset
|
257 |
transaction abort! |
76608f9f27f6
singlehead: introduce special handling of closed heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42967
diff
changeset
|
258 |
rollback completed |
76608f9f27f6
singlehead: introduce special handling of closed heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42967
diff
changeset
|
259 |
abort: rejecting multiple heads on branch "branch_A" |
76608f9f27f6
singlehead: introduce special handling of closed heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42967
diff
changeset
|
260 |
(3 heads: 49003e504178 5254bcccab93 42b9fe70a3c1) |
76608f9f27f6
singlehead: introduce special handling of closed heads
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42967
diff
changeset
|
261 |
[255] |
43734
88a306478556
singlehead: making config item a bool again
Georges Racinet <georges.racinet@octobus.net>
parents:
42969
diff
changeset
|
262 |
|
88a306478556
singlehead: making config item a bool again
Georges Racinet <georges.racinet@octobus.net>
parents:
42969
diff
changeset
|
263 |
|
88a306478556
singlehead: making config item a bool again
Georges Racinet <georges.racinet@octobus.net>
parents:
42969
diff
changeset
|
264 |
Test that config can be overriden as the boolean it is |
88a306478556
singlehead: making config item a bool again
Georges Racinet <georges.racinet@octobus.net>
parents:
42969
diff
changeset
|
265 |
------------------------------------------------------ |
88a306478556
singlehead: making config item a bool again
Georges Racinet <georges.racinet@octobus.net>
parents:
42969
diff
changeset
|
266 |
|
88a306478556
singlehead: making config item a bool again
Georges Racinet <georges.racinet@octobus.net>
parents:
42969
diff
changeset
|
267 |
$ cat <<EOF >> $TESTTMP/single-head-server/.hg/hgrc |
88a306478556
singlehead: making config item a bool again
Georges Racinet <georges.racinet@octobus.net>
parents:
42969
diff
changeset
|
268 |
> [experimental] |
88a306478556
singlehead: making config item a bool again
Georges Racinet <georges.racinet@octobus.net>
parents:
42969
diff
changeset
|
269 |
> single-head-per-branch = no |
88a306478556
singlehead: making config item a bool again
Georges Racinet <georges.racinet@octobus.net>
parents:
42969
diff
changeset
|
270 |
> EOF |
88a306478556
singlehead: making config item a bool again
Georges Racinet <georges.racinet@octobus.net>
parents:
42969
diff
changeset
|
271 |
|
88a306478556
singlehead: making config item a bool again
Georges Racinet <georges.racinet@octobus.net>
parents:
42969
diff
changeset
|
272 |
Because of previous test, we'll also push c_aL0 and c_aM0. |
88a306478556
singlehead: making config item a bool again
Georges Racinet <georges.racinet@octobus.net>
parents:
42969
diff
changeset
|
273 |
|
88a306478556
singlehead: making config item a bool again
Georges Racinet <georges.racinet@octobus.net>
parents:
42969
diff
changeset
|
274 |
$ hg out -T "{desc}\n" |
88a306478556
singlehead: making config item a bool again
Georges Racinet <georges.racinet@octobus.net>
parents:
42969
diff
changeset
|
275 |
comparing with $TESTTMP/single-head-server |
88a306478556
singlehead: making config item a bool again
Georges Racinet <georges.racinet@octobus.net>
parents:
42969
diff
changeset
|
276 |
searching for changes |
88a306478556
singlehead: making config item a bool again
Georges Racinet <georges.racinet@octobus.net>
parents:
42969
diff
changeset
|
277 |
c_aL0 |
88a306478556
singlehead: making config item a bool again
Georges Racinet <georges.racinet@octobus.net>
parents:
42969
diff
changeset
|
278 |
c_aM0 |
88a306478556
singlehead: making config item a bool again
Georges Racinet <georges.racinet@octobus.net>
parents:
42969
diff
changeset
|
279 |
|
88a306478556
singlehead: making config item a bool again
Georges Racinet <georges.racinet@octobus.net>
parents:
42969
diff
changeset
|
280 |
Let's make a new head and push everythin. The server feedback will mention |
88a306478556
singlehead: making config item a bool again
Georges Racinet <georges.racinet@octobus.net>
parents:
42969
diff
changeset
|
281 |
exactly one new head because c_aM0 is closed. |
88a306478556
singlehead: making config item a bool again
Georges Racinet <georges.racinet@octobus.net>
parents:
42969
diff
changeset
|
282 |
|
88a306478556
singlehead: making config item a bool again
Georges Racinet <georges.racinet@octobus.net>
parents:
42969
diff
changeset
|
283 |
$ hg up 'desc("c_aG0")' |
88a306478556
singlehead: making config item a bool again
Georges Racinet <georges.racinet@octobus.net>
parents:
42969
diff
changeset
|
284 |
0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
88a306478556
singlehead: making config item a bool again
Georges Racinet <georges.racinet@octobus.net>
parents:
42969
diff
changeset
|
285 |
$ mkcommit c_aN0 |
88a306478556
singlehead: making config item a bool again
Georges Racinet <georges.racinet@octobus.net>
parents:
42969
diff
changeset
|
286 |
created new head |
88a306478556
singlehead: making config item a bool again
Georges Racinet <georges.racinet@octobus.net>
parents:
42969
diff
changeset
|
287 |
$ hg push -f |
88a306478556
singlehead: making config item a bool again
Georges Racinet <georges.racinet@octobus.net>
parents:
42969
diff
changeset
|
288 |
pushing to $TESTTMP/single-head-server |
88a306478556
singlehead: making config item a bool again
Georges Racinet <georges.racinet@octobus.net>
parents:
42969
diff
changeset
|
289 |
searching for changes |
88a306478556
singlehead: making config item a bool again
Georges Racinet <georges.racinet@octobus.net>
parents:
42969
diff
changeset
|
290 |
adding changesets |
88a306478556
singlehead: making config item a bool again
Georges Racinet <georges.racinet@octobus.net>
parents:
42969
diff
changeset
|
291 |
adding manifests |
88a306478556
singlehead: making config item a bool again
Georges Racinet <georges.racinet@octobus.net>
parents:
42969
diff
changeset
|
292 |
adding file changes |
88a306478556
singlehead: making config item a bool again
Georges Racinet <georges.racinet@octobus.net>
parents:
42969
diff
changeset
|
293 |
added 3 changesets with 3 changes to 3 files (+1 heads) |