annotate tests/test-exchange-obsmarkers-case-A6.t @ 38158:4e790f0966fc

phases: define an official tuple of phases we do not share Same motivation as for `mutablephases`, having a single definition helps with updating phases logic.
author Boris Feld <boris.feld@octobus.net>
date Tue, 22 May 2018 18:10:37 +0200
parents b11e8c67fb0f
children 34a46d48d24e
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
31911
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
1 ============================================
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
2 Testing obsolescence markers push: Cases A.6
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
3 ============================================
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
4
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
5 Mercurial pushes obsolescences markers relevant to the "pushed-set", the set of
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
6 all changesets that requested to be "in sync" after the push (even if they are
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
7 already on both side).
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
8
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
9 This test belongs to a series of tests checking such set is properly computed
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
10 and applied. This does not tests "obsmarkers" discovery capabilities.
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
11
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
12 Category A: simple cases
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
13 TestCase 6: new markers between changesets already known on both side
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
14 Variants:
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
15 # a: explicit push
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
16 # b: bare push
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
17
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
18 A.6 new markers between changesets already known on both side
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
19 ==============================================================
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
20
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
21 .. {{{
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
22 .. A ◕⇠● B
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
23 .. |/
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
24 .. ● O
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
25 .. }}}
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
26 ..
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
27 .. Marker exist from:
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
28 ..
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
29 .. * `A◕⇠● B`
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
30 ..
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
31 .. Command runs:
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
32 ..
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
33 .. * hg push -r B
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
34 .. * hg push
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
35 ..
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
36 .. Expected exchange:
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
37 ..
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
38 .. * `A◕⇠● B`
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
39
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
40 Setup
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
41 -----
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
42
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
43 $ . $TESTDIR/testlib/exchange-obsmarker-util.sh
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
44
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
45 initial
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
46
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
47 $ setuprepos A.6
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
48 creating test repo for test case A.6
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
49 - pulldest
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
50 - main
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
51 - pushdest
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
52 cd into `main` and proceed with env setup
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
53 $ cd main
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
54 $ mkcommit A0
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
55 $ hg update -q 0
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
56 $ mkcommit A1
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
57 created new head
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
58
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
59 make both changeset known in remote
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
60
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
61 $ hg push -qf ../pushdest
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
62 $ hg push -qf ../pulldest
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
63
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
64 create a marker after this
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
65
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
66 $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'`
33542
b11e8c67fb0f debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents: 33252
diff changeset
67 obsoleted 1 changesets
31911
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
68 $ hg log -G --hidden
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
69 @ e5ea8f9c7314 (draft): A1
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
70 |
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
71 | x 28b51eb45704 (draft): A0
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
72 |/
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
73 o a9bdc8b26820 (public): O
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
74
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
75 $ inspect_obsmarkers
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
76 obsstore content
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
77 ================
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
78 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
79 $ cd ..
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
80 $ cd ..
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
81
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
82 $ cp -R A.6 A.6.a
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
83 $ cp -R A.6 A.6.b
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
84
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
85 Actual Test (explicit push version)
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
86 -----------------------------------
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
87
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
88 $ dotest A.6.a A1
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
89 ## Running testcase A.6.a
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
90 # testing echange of "A1" (e5ea8f9c7314)
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
91 ## initial state
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
92 # obstore: main
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
93 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
94 # obstore: pushdest
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
95 # obstore: pulldest
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
96 ## pushing "A1" from main to pushdest
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
97 pushing to pushdest
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
98 searching for changes
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
99 no changes found
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
100 remote: 1 new obsolescence markers
33252
53b3a1968aa6 obsolete: reports the number of local changeset obsoleted when unbundling
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 31911
diff changeset
101 remote: obsoleted 1 changesets
31911
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
102 ## post push state
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
103 # obstore: main
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
104 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
105 # obstore: pushdest
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
106 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
107 # obstore: pulldest
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
108 ## pulling "e5ea8f9c7314" from main into pulldest
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
109 pulling from main
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
110 no changes found
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
111 1 new obsolescence markers
33252
53b3a1968aa6 obsolete: reports the number of local changeset obsoleted when unbundling
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 31911
diff changeset
112 obsoleted 1 changesets
31911
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
113 ## post pull state
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
114 # obstore: main
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
115 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
116 # obstore: pushdest
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
117 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
118 # obstore: pulldest
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
119 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
120
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
121 Actual Test (bare push version)
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
122 -------------------------------
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
123
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
124 $ dotest A.6.b
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
125 ## Running testcase A.6.b
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
126 ## initial state
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
127 # obstore: main
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
128 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
129 # obstore: pushdest
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
130 # obstore: pulldest
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
131 ## pushing from main to pushdest
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
132 pushing to pushdest
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
133 searching for changes
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
134 no changes found
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
135 remote: 1 new obsolescence markers
33252
53b3a1968aa6 obsolete: reports the number of local changeset obsoleted when unbundling
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 31911
diff changeset
136 remote: obsoleted 1 changesets
31911
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
137 ## post push state
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
138 # obstore: main
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
139 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
140 # obstore: pushdest
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
141 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
142 # obstore: pulldest
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
143 ## pulling from main into pulldest
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
144 pulling from main
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
145 searching for changes
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
146 no changes found
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
147 1 new obsolescence markers
33252
53b3a1968aa6 obsolete: reports the number of local changeset obsoleted when unbundling
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 31911
diff changeset
148 obsoleted 1 changesets
31911
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
149 ## post pull state
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
150 # obstore: main
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
151 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
152 # obstore: pushdest
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
153 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
154 # obstore: pulldest
7d8b9c80ba70 obsolescence: add test case A-6 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
155 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}