comparison tests/test-exchange-A7.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 === A.7 Non targeted common changeset ===
7
8 .. {{{
9 .. ⇠◕ A
10 .. |
11 .. ● O
12 .. }}}
13 ..
14 .. Marker exist from:
15 ..
16 .. * Chain from A
17 ..
18 .. Command run:
19 ..
20 .. * hg push -r O
21 ..
22 .. Expected exchange:
23 ..
24 .. * ø
25
26
27 $ setuprepos A.7
28 creating test repo for test case A.7
29 - pulldest
30 - main
31 - pushdest
32 cd into `main` and proceed with env setup
33 $ cd main
34 $ mkcommit A
35 $ hg push -q ../pushdest
36 $ hg push -q ../pulldest
37 $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(A)'`
38 $ hg log -G --hidden
39 @ f5bc6836db60 (draft): A
40 |
41 o a9bdc8b26820 (public): O
42
43 $ hg debugobsolete
44 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
45 $ cd ..
46 $ cd ..
47
48 Actual Test
49 -----------------------------------
50
51 $ dotest A.7 O
52 ## Running testcase A.7
53 # testing echange of "O" (a9bdc8b26820)
54 ## initial state
55 # obstore: main
56 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
57 # obstore: pushdest
58 # obstore: pulldest
59 ## pushing "O" from main to pushdest
60 pushing to pushdest
61 searching for changes
62 no changes found
63 ## post push state
64 # obstore: main
65 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
66 # obstore: pushdest
67 # obstore: pulldest
68 ## pulling "a9bdc8b26820" from main into pulldest
69 pulling from main
70 no changes found
71 ## post pull state
72 # obstore: main
73 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
74 # obstore: pushdest
75 # obstore: pulldest