Mercurial > evolve
comparison tests/test-exchange-D4.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 | |
3 Initial setup | |
4 | |
5 $ . $TESTDIR/_exc-util.sh | |
6 | |
7 === D.4 Unknown changeset in between known one === | |
8 | |
9 .. Mostly a clarification case | |
10 .. | |
11 .. {{{ | |
12 .. ø⇠◌⇠○ | |
13 .. | |/ | |
14 .. | ◔ | |
15 .. |/ | |
16 .. ● O | |
17 .. | |
18 .. }}} | |
19 .. | |
20 .. Should be treated as A.3 case: | |
21 .. | |
22 .. {{{ | |
23 .. | |
24 .. ø⇠○ | |
25 .. | | | |
26 .. | ◔ | |
27 .. |/ | |
28 .. ● O | |
29 .. | |
30 .. }}} | |
31 | |
32 | |
33 initial | |
34 | |
35 $ setuprepos A.3.a | |
36 creating test repo for test case A.3.a | |
37 - pulldest | |
38 - main | |
39 - pushdest | |
40 cd into `main` and proceed with env setup | |
41 $ cd main | |
42 $ mkcommit A0 | |
43 $ mkcommit B0 | |
44 $ hg update -q 0 | |
45 $ mkcommit A1 | |
46 created new head | |
47 $ mkcommit B1 | |
48 $ hg debugobsolete `getid 'desc(A0)'` aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa | |
49 $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(A1)'` | |
50 $ hg debugobsolete `getid 'desc(B0)'` bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb | |
51 $ hg debugobsolete bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb `getid 'desc(B1)'` | |
52 $ hg log -G --hidden | |
53 @ 069b05c3876d (draft): B1 | |
54 | | |
55 o e5ea8f9c7314 (draft): A1 | |
56 | | |
57 | x 6e72f0a95b5e (draft): B0 | |
58 | | | |
59 | x 28b51eb45704 (draft): A0 | |
60 |/ | |
61 o a9bdc8b26820 (public): O | |
62 | |
63 $ hg debugobsolete | |
64 28b51eb45704506b5c603decd6bf7ac5e0f6a52f aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
65 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
66 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
67 bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 069b05c3876d56f62895e853a501ea58ea85f68d 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
68 $ cd .. | |
69 $ cd .. | |
70 | |
71 Actual Test for first version (changeset unknown in remote) | |
72 ----------------------------------------------------------- | |
73 | |
74 $ dotest A.3.a A1 | |
75 ## Running testcase A.3.a | |
76 # testing echange of "A1" (e5ea8f9c7314) | |
77 ## initial state | |
78 # obstore: main | |
79 28b51eb45704506b5c603decd6bf7ac5e0f6a52f aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
80 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
81 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
82 bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 069b05c3876d56f62895e853a501ea58ea85f68d 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
83 # obstore: pushdest | |
84 # obstore: pulldest | |
85 ## pushing "A1" from main to pushdest | |
86 pushing to pushdest | |
87 searching for changes | |
88 remote: adding changesets | |
89 remote: adding manifests | |
90 remote: adding file changes | |
91 remote: added 1 changesets with 1 changes to 1 files | |
92 remote: 2 new obsolescence markers | |
93 ## post push state | |
94 # obstore: main | |
95 28b51eb45704506b5c603decd6bf7ac5e0f6a52f aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
96 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
97 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
98 bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 069b05c3876d56f62895e853a501ea58ea85f68d 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
99 # obstore: pushdest | |
100 28b51eb45704506b5c603decd6bf7ac5e0f6a52f aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
101 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
102 # obstore: pulldest | |
103 ## pulling "e5ea8f9c7314" from main into pulldest | |
104 pulling from main | |
105 searching for changes | |
106 adding changesets | |
107 adding manifests | |
108 adding file changes | |
109 added 1 changesets with 1 changes to 1 files | |
110 2 new obsolescence markers | |
111 (run 'hg update' to get a working copy) | |
112 ## post pull state | |
113 # obstore: main | |
114 28b51eb45704506b5c603decd6bf7ac5e0f6a52f aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
115 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
116 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
117 bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 069b05c3876d56f62895e853a501ea58ea85f68d 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
118 # obstore: pushdest | |
119 28b51eb45704506b5c603decd6bf7ac5e0f6a52f aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
120 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
121 # obstore: pulldest | |
122 28b51eb45704506b5c603decd6bf7ac5e0f6a52f aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
123 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
124 | |
125 |