1 |
|
2 |
|
3 Initial setup |
|
4 |
|
5 $ . $TESTDIR/testlib/exchange-util.sh |
|
6 |
|
7 === A.2 Two heads === |
|
8 |
|
9 .. {{{ |
|
10 .. ⇠○ B |
|
11 .. ⇠◔ | A |
|
12 .. |/ |
|
13 .. ● O |
|
14 .. }}} |
|
15 .. |
|
16 .. Marker exist from: |
|
17 .. |
|
18 .. * A |
|
19 .. * B |
|
20 .. |
|
21 .. |
|
22 .. Command run: |
|
23 .. |
|
24 .. * hg push -r A |
|
25 .. |
|
26 .. Expected exchange: |
|
27 .. |
|
28 .. * chain from A |
|
29 .. |
|
30 .. Expected Exclude: |
|
31 .. |
|
32 .. * chain from B |
|
33 |
|
34 initial |
|
35 |
|
36 $ setuprepos A.2 |
|
37 creating test repo for test case A.2 |
|
38 - pulldest |
|
39 - main |
|
40 - pushdest |
|
41 cd into `main` and proceed with env setup |
|
42 $ cd main |
|
43 $ mkcommit A |
|
44 $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(A)'` |
|
45 $ hg up .^ |
|
46 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
47 $ mkcommit B |
|
48 created new head |
|
49 $ hg debugobsolete bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb `getid 'desc(B)'` |
|
50 $ hg log -G |
|
51 @ 35b183996678 (draft): B |
|
52 | |
|
53 | o f5bc6836db60 (draft): A |
|
54 |/ |
|
55 o a9bdc8b26820 (public): O |
|
56 |
|
57 $ hg debugobsolete |
|
58 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
59 bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 35b1839966785d5703a01607229eea932db42f87 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
60 $ hg debugobsrelsethashtree |
|
61 a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04 0000000000000000000000000000000000000000 |
|
62 f5bc6836db60e308a17ba08bf050154ba9c4fad7 50656e04a95ecdfed94659dd61f663b2caa55e98 |
|
63 35b1839966785d5703a01607229eea932db42f87 b9c8f20eef8938ebab939fe6a592587feacf3245 |
|
64 $ hg debugobshashrange --subranges --rev 'head()' |
|
65 rev node index size depth obshash |
|
66 2 35b183996678 0 2 2 b9c8f20eef89 |
|
67 1 f5bc6836db60 0 2 2 50656e04a95e |
|
68 2 35b183996678 1 1 2 b9c8f20eef89 |
|
69 0 a9bdc8b26820 0 1 1 000000000000 |
|
70 1 f5bc6836db60 1 1 2 50656e04a95e |
|
71 $ cd .. |
|
72 $ cd .. |
|
73 |
|
74 |
|
75 Actual Test |
|
76 --------------- |
|
77 |
|
78 $ dotest A.2 A |
|
79 ## Running testcase A.2 |
|
80 # testing echange of "A" (f5bc6836db60) |
|
81 ## initial state |
|
82 # obstore: main |
|
83 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
84 bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 35b1839966785d5703a01607229eea932db42f87 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
85 # obstore: pushdest |
|
86 # obstore: pulldest |
|
87 ## pushing "A" from main to pushdest |
|
88 pushing to pushdest |
|
89 searching for changes |
|
90 remote: adding changesets |
|
91 remote: adding manifests |
|
92 remote: adding file changes |
|
93 remote: added 1 changesets with 1 changes to 1 files |
|
94 remote: 1 new obsolescence markers |
|
95 ## post push state |
|
96 # obstore: main |
|
97 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
98 bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 35b1839966785d5703a01607229eea932db42f87 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
99 # obstore: pushdest |
|
100 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
101 # obstore: pulldest |
|
102 ## pulling "f5bc6836db60" from main into pulldest |
|
103 pulling from main |
|
104 searching for changes |
|
105 adding changesets |
|
106 adding manifests |
|
107 adding file changes |
|
108 added 1 changesets with 1 changes to 1 files |
|
109 1 new obsolescence markers |
|
110 (run 'hg update' to get a working copy) |
|
111 ## post pull state |
|
112 # obstore: main |
|
113 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
114 bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 35b1839966785d5703a01607229eea932db42f87 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
115 # obstore: pushdest |
|
116 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
117 # obstore: pulldest |
|
118 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
119 |
|
120 |
|
121 $ cd .. |
|