comparison tests/test-exchange-D3.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 8a06b32061ce
children 778afb036245
comparison
equal deleted inserted replaced
2019:996a562b6c9f 2020:143c8e4dc22d
1
2
3
4 Initial setup
5
6 $ . $TESTDIR/_exc-util.sh
7
8 === D.2 missing prune target (prune in "pushed set") ===
9
10 {{{
11 }}}
12
13 Marker exist from:
14
15 * A' succeed to A
16 * A' (prune)
17
18 Command run:
19
20 * hg push
21
22 Expected exchange:
23
24 * `A ø⇠o A'`
25 * A' (prune)
26
27
28 $ setuprepos D.2
29 creating test repo for test case D.2
30 - pulldest
31 - main
32 - pushdest
33 cd into `main` and proceed with env setup
34 $ cd main
35 $ mkcommit A0
36 $ hg up -q 0
37 $ mkcommit B
38 created new head
39 $ mkcommit A1
40 $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'`
41 $ hg prune -d '0 0' .
42 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
43 working directory now at 35b183996678
44 1 changesets pruned
45 $ hg strip --hidden -q 'desc(A1)'
46 $ hg log -G --hidden
47 @ 35b183996678 (draft): B
48 |
49 | x 28b51eb45704 (draft): A0
50 |/
51 o a9bdc8b26820 (public): O
52
53 $ hg debugobsolete
54 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 6aa67a7b4baa6fb41b06aed38d5b1201436546e2 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
55 6aa67a7b4baa6fb41b06aed38d5b1201436546e2 0 {35b1839966785d5703a01607229eea932db42f87} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
56 $ cd ..
57 $ cd ..
58
59 Actual Test
60 -------------------------------------
61
62 $ dotest D.2 O
63 ## Running testcase D.2
64 # testing echange of "O" (a9bdc8b26820)
65 ## initial state
66 # obstore: main
67 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 6aa67a7b4baa6fb41b06aed38d5b1201436546e2 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
68 6aa67a7b4baa6fb41b06aed38d5b1201436546e2 0 {35b1839966785d5703a01607229eea932db42f87} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
69 # obstore: pushdest
70 # obstore: pulldest
71 ## pushing "O" from main to pushdest
72 pushing to pushdest
73 searching for changes
74 no changes found
75 ## post push state
76 # obstore: main
77 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 6aa67a7b4baa6fb41b06aed38d5b1201436546e2 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
78 6aa67a7b4baa6fb41b06aed38d5b1201436546e2 0 {35b1839966785d5703a01607229eea932db42f87} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
79 # obstore: pushdest
80 # obstore: pulldest
81 ## pulling "a9bdc8b26820" from main into pulldest
82 pulling from main
83 no changes found
84 ## post pull state
85 # obstore: main
86 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 6aa67a7b4baa6fb41b06aed38d5b1201436546e2 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
87 6aa67a7b4baa6fb41b06aed38d5b1201436546e2 0 {35b1839966785d5703a01607229eea932db42f87} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
88 # obstore: pushdest
89 # obstore: pulldest
90