comparison tests/test-exchange-B1.t @ 2020:143c8e4dc22d

topic: merge the topic extension in the evolve repository There is a lot of synergy between the two concepts. Topic is expected to be able to smooth multiple of evolution sharp edge. Having them both in the same repository will make this collaboration easier.
author Pierre-Yves David <pierre-yves.david@ens-lyon.org>
date Thu, 02 Mar 2017 18:07:46 +0100
parents a49f2e7a2755
children 778afb036245
comparison
equal deleted inserted replaced
2019:996a562b6c9f 2020:143c8e4dc22d
1
2 Initial setup
3
4 $ . $TESTDIR/_exc-util.sh
5
6 === B.1 Prune on non-targeted common changeset ===
7
8 .. {{{
9 .. ⊗ B
10 .. |
11 .. ◕ A
12 .. |
13 .. ● O
14 .. }}}
15 ..
16 .. Marker exist from:
17 ..
18 .. * B (prune)
19 ..
20 .. Command run:
21 ..
22 .. * hg push -r O
23 .. * hg push
24 ..
25 .. Expected exchange:
26 ..
27 .. * B (prune)
28
29
30 $ setuprepos B.1
31 creating test repo for test case B.1
32 - pulldest
33 - main
34 - pushdest
35 cd into `main` and proceed with env setup
36 $ cd main
37 $ mkcommit A
38 $ mkcommit B
39 $ hg prune -qd '0 0' .
40 $ hg log -G --hidden
41 x f6fbb35d8ac9 (draft): B
42 |
43 @ f5bc6836db60 (draft): A
44 |
45 o a9bdc8b26820 (public): O
46
47 $ hg debugobsolete
48 f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
49 $ cd ..
50 $ cd ..
51
52
53 $ cp -r B.1 B.1.a
54 $ cp -r B.1 B.1.b
55
56 Actual Test (explicit push version)
57 -----------------------------------
58
59 $ dotest B.1.a A
60 ## Running testcase B.1.a
61 # testing echange of "A" (f5bc6836db60)
62 ## initial state
63 # obstore: main
64 f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
65 # obstore: pushdest
66 # obstore: pulldest
67 ## pushing "A" from main to pushdest
68 pushing to pushdest
69 searching for changes
70 remote: adding changesets
71 remote: adding manifests
72 remote: adding file changes
73 remote: added 1 changesets with 1 changes to 1 files
74 remote: 1 new obsolescence markers
75 ## post push state
76 # obstore: main
77 f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
78 # obstore: pushdest
79 f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
80 # obstore: pulldest
81 ## pulling "f5bc6836db60" from main into pulldest
82 pulling from main
83 searching for changes
84 adding changesets
85 adding manifests
86 adding file changes
87 added 1 changesets with 1 changes to 1 files
88 1 new obsolescence markers
89 (run 'hg update' to get a working copy)
90 ## post pull state
91 # obstore: main
92 f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
93 # obstore: pushdest
94 f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
95 # obstore: pulldest
96 f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
97
98 Actual Test (bare push version)
99 -----------------------------------
100
101 $ dotest B.1.b
102 ## Running testcase B.1.b
103 ## initial state
104 # obstore: main
105 f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
106 # obstore: pushdest
107 # obstore: pulldest
108 ## pushing from main to pushdest
109 pushing to pushdest
110 searching for changes
111 remote: adding changesets
112 remote: adding manifests
113 remote: adding file changes
114 remote: added 1 changesets with 1 changes to 1 files
115 remote: 1 new obsolescence markers
116 ## post push state
117 # obstore: main
118 f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
119 # obstore: pushdest
120 f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
121 # obstore: pulldest
122 ## pulling from main into pulldest
123 pulling from main
124 searching for changes
125 adding changesets
126 adding manifests
127 adding file changes
128 added 1 changesets with 1 changes to 1 files
129 1 new obsolescence markers
130 (run 'hg update' to get a working copy)
131 ## post pull state
132 # obstore: main
133 f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
134 # obstore: pushdest
135 f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
136 # obstore: pulldest
137 f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}