Mercurial > evolve
comparison tests/test-exchange-A4.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 | |
7 === A.4 Push in the middle of the obsolescence chain === | |
8 | |
9 .. (Where we show that we should not push the marker without the successors) | |
10 .. | |
11 .. {{{ | |
12 .. B ◔ | |
13 .. | | |
14 .. A⇠ø⇠○ A' | |
15 .. |/ | |
16 .. ● O | |
17 .. }}} | |
18 .. | |
19 .. Marker exist from: | |
20 .. | |
21 .. * `Aø⇠○ A'` | |
22 .. * chain from A | |
23 .. | |
24 .. Command run: | |
25 .. | |
26 .. * hg push -r B | |
27 .. | |
28 .. Expected exchange: | |
29 .. | |
30 .. * Chain from A | |
31 .. | |
32 .. Expected Exclude: | |
33 .. | |
34 .. * `Aø⇠○ A'` | |
35 | |
36 | |
37 initial | |
38 | |
39 $ setuprepos A.4 | |
40 creating test repo for test case A.4 | |
41 - pulldest | |
42 - main | |
43 - pushdest | |
44 cd into `main` and proceed with env setup | |
45 $ cd main | |
46 $ mkcommit A0 | |
47 $ mkcommit B | |
48 $ hg update 0 | |
49 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
50 $ mkcommit A1 | |
51 created new head | |
52 $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(A0)'` | |
53 $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'` | |
54 $ hg log -G --hidden | |
55 @ e5ea8f9c7314 (draft): A1 | |
56 | | |
57 | o 06055a7959d4 (draft): B | |
58 | | | |
59 | x 28b51eb45704 (draft): A0 | |
60 |/ | |
61 o a9bdc8b26820 (public): O | |
62 | |
63 $ hg debugobsolete | |
64 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
65 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
66 $ cd .. | |
67 $ cd .. | |
68 | |
69 Actual Test for first version (changeset unknown in remote) | |
70 ----------------------------------------------------------- | |
71 | |
72 $ dotest A.4 B -f | |
73 ## Running testcase A.4 | |
74 # testing echange of "B" (06055a7959d4) | |
75 ## initial state | |
76 # obstore: main | |
77 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
78 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
79 # obstore: pushdest | |
80 # obstore: pulldest | |
81 ## pushing "B" from main to pushdest | |
82 pushing to pushdest | |
83 searching for changes | |
84 remote: adding changesets | |
85 remote: adding manifests | |
86 remote: adding file changes | |
87 remote: added 2 changesets with 2 changes to 2 files | |
88 remote: 1 new obsolescence markers | |
89 ## post push state | |
90 # obstore: main | |
91 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
92 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
93 # obstore: pushdest | |
94 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
95 # obstore: pulldest | |
96 ## pulling "06055a7959d4" from main into pulldest | |
97 pulling from main | |
98 searching for changes | |
99 adding changesets | |
100 adding manifests | |
101 adding file changes | |
102 added 2 changesets with 2 changes to 2 files | |
103 1 new obsolescence markers | |
104 (run 'hg update' to get a working copy) | |
105 ## post pull state | |
106 # obstore: main | |
107 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
108 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
109 # obstore: pushdest | |
110 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
111 # obstore: pulldest | |
112 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |