equal
deleted
inserted
replaced
3 |
3 |
4 Initial setup |
4 Initial setup |
5 |
5 |
6 $ . $TESTDIR/testlib/exchange-util.sh |
6 $ . $TESTDIR/testlib/exchange-util.sh |
7 |
7 |
8 === D.2 missing prune target (prune in "pushed set") === |
8 === D.3 missing prune target (prune in "pushed set") === |
9 |
9 |
10 {{{ |
10 {{{ |
11 }}} |
11 }}} |
12 |
12 |
13 Marker exist from: |
13 Marker exist from: |
23 |
23 |
24 * `A ø⇠o A'` |
24 * `A ø⇠o A'` |
25 * A' (prune) |
25 * A' (prune) |
26 |
26 |
27 |
27 |
28 $ setuprepos D.2 |
28 $ setuprepos D.3 |
29 creating test repo for test case D.2 |
29 creating test repo for test case D.3 |
30 - pulldest |
30 - pulldest |
31 - main |
31 - main |
32 - pushdest |
32 - pushdest |
33 cd into `main` and proceed with env setup |
33 cd into `main` and proceed with env setup |
34 $ cd main |
34 $ cd main |
66 $ cd .. |
66 $ cd .. |
67 |
67 |
68 Actual Test |
68 Actual Test |
69 ------------------------------------- |
69 ------------------------------------- |
70 |
70 |
71 $ dotest D.2 O |
71 $ dotest D.3 O |
72 ## Running testcase D.2 |
72 ## Running testcase D.3 |
73 # testing echange of "O" (a9bdc8b26820) |
73 # testing echange of "O" (a9bdc8b26820) |
74 ## initial state |
74 ## initial state |
75 # obstore: main |
75 # obstore: main |
76 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 6aa67a7b4baa6fb41b06aed38d5b1201436546e2 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
76 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 6aa67a7b4baa6fb41b06aed38d5b1201436546e2 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
77 6aa67a7b4baa6fb41b06aed38d5b1201436546e2 0 {35b1839966785d5703a01607229eea932db42f87} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
77 6aa67a7b4baa6fb41b06aed38d5b1201436546e2 0 {35b1839966785d5703a01607229eea932db42f87} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |