annotate tests/test-exchange-D4.t @ 2136:086a85c37e9e

stablerange: compute subranges from parent when possible Unless we are a merge, we can infer the standard subranges of a range by reusing the subranger of its parent. We update the implementation to do so. We still needs the "old way" for merge. We move that code in a dedicated function for the sake of simplicity.
author Pierre-Yves David <pierre-yves.david@ens-lyon.org>
date Sun, 19 Mar 2017 05:33:52 +0100
parents d0bc98161794
children 3b18440cca74
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
851
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
1
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
2
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
3 Initial setup
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
4
2118
d0bc98161794 tests: move exchange utility in testlib
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2083
diff changeset
5 $ . $TESTDIR/testlib/exchange-util.sh
851
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
6
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
7 === D.4 Unknown changeset in between known one ===
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
8
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
9 .. Mostly a clarification case
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
10 ..
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
11 .. {{{
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
12 .. ø⇠◌⇠○
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
13 .. | |/
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
14 .. | ◔
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
15 .. |/
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
16 .. ● O
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
17 ..
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
18 .. }}}
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
19 ..
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
20 .. Should be treated as A.3 case:
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
21 ..
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
22 .. {{{
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
23 ..
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
24 .. ø⇠○
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
25 .. | |
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
26 .. | ◔
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
27 .. |/
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
28 .. ● O
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
29 ..
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
30 .. }}}
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
31
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
32
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
33 initial
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
34
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
35 $ setuprepos A.3.a
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
36 creating test repo for test case A.3.a
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
37 - pulldest
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
38 - main
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
39 - pushdest
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
40 cd into `main` and proceed with env setup
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
41 $ cd main
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
42 $ mkcommit A0
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
43 $ mkcommit B0
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
44 $ hg update -q 0
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
45 $ mkcommit A1
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
46 created new head
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
47 $ mkcommit B1
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
48 $ hg debugobsolete `getid 'desc(A0)'` aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
49 $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(A1)'`
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
50 $ hg debugobsolete `getid 'desc(B0)'` bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
51 $ hg debugobsolete bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb `getid 'desc(B1)'`
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
52 $ hg log -G --hidden
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
53 @ 069b05c3876d (draft): B1
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
54 |
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
55 o e5ea8f9c7314 (draft): A1
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
56 |
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
57 | x 6e72f0a95b5e (draft): B0
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
58 | |
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
59 | x 28b51eb45704 (draft): A0
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
60 |/
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
61 o a9bdc8b26820 (public): O
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
62
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
63 $ hg debugobsolete
1065
f355bbc124fc test: update test to new date formatting in debuobsolete output
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1060
diff changeset
64 28b51eb45704506b5c603decd6bf7ac5e0f6a52f aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
f355bbc124fc test: update test to new date formatting in debuobsolete output
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1060
diff changeset
65 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
f355bbc124fc test: update test to new date formatting in debuobsolete output
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1060
diff changeset
66 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
f355bbc124fc test: update test to new date formatting in debuobsolete output
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1060
diff changeset
67 bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 069b05c3876d56f62895e853a501ea58ea85f68d 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
2083
778afb036245 discovery: introduce a official 'obshash associated to a range
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 1093
diff changeset
68 $ hg debugobsrelsethashtree
778afb036245 discovery: introduce a official 'obshash associated to a range
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 1093
diff changeset
69 a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04 0000000000000000000000000000000000000000
778afb036245 discovery: introduce a official 'obshash associated to a range
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 1093
diff changeset
70 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0000000000000000000000000000000000000000
778afb036245 discovery: introduce a official 'obshash associated to a range
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 1093
diff changeset
71 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 0000000000000000000000000000000000000000
778afb036245 discovery: introduce a official 'obshash associated to a range
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 1093
diff changeset
72 e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0aacc2f86e8fca29f2d5fd8d0790644620acd58a
778afb036245 discovery: introduce a official 'obshash associated to a range
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 1093
diff changeset
73 069b05c3876d56f62895e853a501ea58ea85f68d 40b98bc2b5b1152416ea8e9665ae1c6a3ce32ba0
778afb036245 discovery: introduce a official 'obshash associated to a range
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 1093
diff changeset
74 $ hg debugstablerange --rev 'head()'
778afb036245 discovery: introduce a official 'obshash associated to a range
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 1093
diff changeset
75 rev node index size depth obshash
778afb036245 discovery: introduce a official 'obshash associated to a range
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 1093
diff changeset
76 4 069b05c3876d 0 3 3 a2b2331da650
778afb036245 discovery: introduce a official 'obshash associated to a range
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 1093
diff changeset
77 3 e5ea8f9c7314 0 2 2 0aacc2f86e8f
778afb036245 discovery: introduce a official 'obshash associated to a range
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 1093
diff changeset
78 4 069b05c3876d 2 1 3 901f118d4333
778afb036245 discovery: introduce a official 'obshash associated to a range
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 1093
diff changeset
79 0 a9bdc8b26820 0 1 1 000000000000
778afb036245 discovery: introduce a official 'obshash associated to a range
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 1093
diff changeset
80 3 e5ea8f9c7314 1 1 2 0aacc2f86e8f
851
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
81 $ cd ..
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
82 $ cd ..
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
83
984
b286f77d680c tests: fix grammar, spelling, punctuation in comments
Greg Ward <greg@gerg.ca>
parents: 957
diff changeset
84 Actual Test for first version (changeset unknown in remote)
b286f77d680c tests: fix grammar, spelling, punctuation in comments
Greg Ward <greg@gerg.ca>
parents: 957
diff changeset
85 -----------------------------------------------------------
851
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
86
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
87 $ dotest A.3.a A1
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
88 ## Running testcase A.3.a
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
89 # testing echange of "A1" (e5ea8f9c7314)
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
90 ## initial state
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
91 # obstore: main
1065
f355bbc124fc test: update test to new date formatting in debuobsolete output
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1060
diff changeset
92 28b51eb45704506b5c603decd6bf7ac5e0f6a52f aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
f355bbc124fc test: update test to new date formatting in debuobsolete output
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1060
diff changeset
93 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
f355bbc124fc test: update test to new date formatting in debuobsolete output
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1060
diff changeset
94 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
f355bbc124fc test: update test to new date formatting in debuobsolete output
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1060
diff changeset
95 bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 069b05c3876d56f62895e853a501ea58ea85f68d 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
851
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
96 # obstore: pushdest
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
97 # obstore: pulldest
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
98 ## pushing "A1" from main to pushdest
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
99 pushing to pushdest
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
100 searching for changes
1089
cdd22a5e5ef1 enable bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1088
diff changeset
101 remote: adding changesets
cdd22a5e5ef1 enable bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1088
diff changeset
102 remote: adding manifests
cdd22a5e5ef1 enable bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1088
diff changeset
103 remote: adding file changes
cdd22a5e5ef1 enable bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1088
diff changeset
104 remote: added 1 changesets with 1 changes to 1 files
1093
a49f2e7a2755 obsexch: respect todosteps when using the old push
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1089
diff changeset
105 remote: 2 new obsolescence markers
851
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
106 ## post push state
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
107 # obstore: main
1065
f355bbc124fc test: update test to new date formatting in debuobsolete output
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1060
diff changeset
108 28b51eb45704506b5c603decd6bf7ac5e0f6a52f aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
f355bbc124fc test: update test to new date formatting in debuobsolete output
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1060
diff changeset
109 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
f355bbc124fc test: update test to new date formatting in debuobsolete output
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1060
diff changeset
110 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
f355bbc124fc test: update test to new date formatting in debuobsolete output
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1060
diff changeset
111 bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 069b05c3876d56f62895e853a501ea58ea85f68d 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
851
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
112 # obstore: pushdest
1065
f355bbc124fc test: update test to new date formatting in debuobsolete output
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1060
diff changeset
113 28b51eb45704506b5c603decd6bf7ac5e0f6a52f aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
f355bbc124fc test: update test to new date formatting in debuobsolete output
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1060
diff changeset
114 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
851
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
115 # obstore: pulldest
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
116 ## pulling "e5ea8f9c7314" from main into pulldest
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
117 pulling from main
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
118 searching for changes
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
119 adding changesets
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
120 adding manifests
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
121 adding file changes
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
122 added 1 changesets with 1 changes to 1 files
1093
a49f2e7a2755 obsexch: respect todosteps when using the old push
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1089
diff changeset
123 2 new obsolescence markers
851
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
124 (run 'hg update' to get a working copy)
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
125 ## post pull state
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
126 # obstore: main
1065
f355bbc124fc test: update test to new date formatting in debuobsolete output
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1060
diff changeset
127 28b51eb45704506b5c603decd6bf7ac5e0f6a52f aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
f355bbc124fc test: update test to new date formatting in debuobsolete output
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1060
diff changeset
128 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
f355bbc124fc test: update test to new date formatting in debuobsolete output
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1060
diff changeset
129 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
f355bbc124fc test: update test to new date formatting in debuobsolete output
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1060
diff changeset
130 bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 069b05c3876d56f62895e853a501ea58ea85f68d 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
851
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
131 # obstore: pushdest
1065
f355bbc124fc test: update test to new date formatting in debuobsolete output
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1060
diff changeset
132 28b51eb45704506b5c603decd6bf7ac5e0f6a52f aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
f355bbc124fc test: update test to new date formatting in debuobsolete output
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1060
diff changeset
133 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
851
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
134 # obstore: pulldest
1065
f355bbc124fc test: update test to new date formatting in debuobsolete output
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1060
diff changeset
135 28b51eb45704506b5c603decd6bf7ac5e0f6a52f aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
f355bbc124fc test: update test to new date formatting in debuobsolete output
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1060
diff changeset
136 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
851
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
137
cf44d1d865c6 exchange: add test case for D.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
138