1 |
|
2 Initial setup |
|
3 |
|
4 $ . $TESTDIR/testlib/exchange-util.sh |
|
5 |
|
6 === D.1 Pruned changeset based on missing precursor of something not present === |
|
7 |
|
8 .. {{{ |
|
9 .. B ⊗ |
|
10 .. | |
|
11 .. A ◌⇠◔ A' |
|
12 .. |/ |
|
13 .. ● O |
|
14 .. }}} |
|
15 .. |
|
16 .. Marker exist from: |
|
17 .. |
|
18 .. * A' succeed to A |
|
19 .. * B (prune) |
|
20 .. |
|
21 .. Command run: |
|
22 .. |
|
23 .. * hg push -r A' |
|
24 .. * hg push |
|
25 .. |
|
26 .. Expected exchange: |
|
27 .. |
|
28 .. * `A ø⇠o A'` |
|
29 .. * B (prune) |
|
30 |
|
31 $ setuprepos D.1 |
|
32 creating test repo for test case D.1 |
|
33 - pulldest |
|
34 - main |
|
35 - pushdest |
|
36 cd into `main` and proceed with env setup |
|
37 $ cd main |
|
38 $ mkcommit A0 |
|
39 $ mkcommit B |
|
40 $ hg up -q 0 |
|
41 $ mkcommit A1 |
|
42 created new head |
|
43 $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'` |
|
44 $ hg prune -d '0 0' 'desc(B)' |
|
45 1 changesets pruned |
|
46 $ hg strip --hidden -q 'desc(A0)' |
|
47 $ hg log -G --hidden |
|
48 @ e5ea8f9c7314 (draft): A1 |
|
49 | |
|
50 o a9bdc8b26820 (public): O |
|
51 |
|
52 $ hg debugobsolete |
|
53 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
54 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
55 $ hg debugobsrelsethashtree |
|
56 a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04 0000000000000000000000000000000000000000 |
|
57 e5ea8f9c73143125d36658e90ef70c6d2027a5b7 289cb0d058c81c763eca8bb438657dba9a7ba646 |
|
58 $ hg debugobshashrange --subranges --rev 'head()' |
|
59 rev node index size depth obshash |
|
60 1 e5ea8f9c7314 0 2 2 289cb0d058c8 |
|
61 0 a9bdc8b26820 0 1 1 000000000000 |
|
62 1 e5ea8f9c7314 1 1 2 289cb0d058c8 |
|
63 $ cd .. |
|
64 $ cd .. |
|
65 |
|
66 Actual Test |
|
67 ------------------------------------- |
|
68 |
|
69 $ dotest D.1 A1 |
|
70 ## Running testcase D.1 |
|
71 # testing echange of "A1" (e5ea8f9c7314) |
|
72 ## initial state |
|
73 # obstore: main |
|
74 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
75 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
76 # obstore: pushdest |
|
77 # obstore: pulldest |
|
78 ## pushing "A1" from main to pushdest |
|
79 pushing to pushdest |
|
80 searching for changes |
|
81 remote: adding changesets |
|
82 remote: adding manifests |
|
83 remote: adding file changes |
|
84 remote: added 1 changesets with 1 changes to 1 files |
|
85 remote: 2 new obsolescence markers |
|
86 ## post push state |
|
87 # obstore: main |
|
88 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
89 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
90 # obstore: pushdest |
|
91 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
92 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
93 # obstore: pulldest |
|
94 ## pulling "e5ea8f9c7314" from main into pulldest |
|
95 pulling from main |
|
96 searching for changes |
|
97 adding changesets |
|
98 adding manifests |
|
99 adding file changes |
|
100 added 1 changesets with 1 changes to 1 files |
|
101 2 new obsolescence markers |
|
102 (run 'hg update' to get a working copy) |
|
103 ## post pull state |
|
104 # obstore: main |
|
105 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
106 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
107 # obstore: pushdest |
|
108 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
109 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
110 # obstore: pulldest |
|
111 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
112 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
113 |
|