annotate tests/test-exchange-B1.t @ 996:b98dd5d3065c

fold: overhaul handling of revisions with --rev (BC) The fold command parsed the revision arguments in a very peculiar and idiosyncratic fashion: if revisions were passed without a --rev argument, then they would all be extended to ".", but if they were passed with --rev, then no extension would happen. Passing revisions both with and without --rev would abort. This is inconsistent with the way all other hg commands parse revision arguments. We have several examples of command where several revisions are passed, and the --rev option is optional for specifying those revisions (update, strip, export). This patch alters the way in which fold parses its revision arguments. No distinction is made between revisions passed with or without the --rev argument. Regardless if a single or multiple revision is specified, all will be folded together into the parent of the working directory. If the --exact argument is passed, then the parent of the working directory is ignored and the specified revisions must be a single contiguous line. The docstring and tests are modified accordingly.
author Jordi Gutiérrez Hermoso <jordigh@octave.org>
date Mon, 30 Jun 2014 13:29:49 -0400
parents b286f77d680c
children bddee73b361e
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
837
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
1
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
2 Initial setup
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
3
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
4 $ . $TESTDIR/_exc-util.sh
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
5
984
b286f77d680c tests: fix grammar, spelling, punctuation in comments
Greg Ward <greg@gerg.ca>
parents: 957
diff changeset
6 === B.1 Prune on non-targeted common changeset ===
837
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
7
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
8 .. {{{
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
9 .. ⊗ B
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
10 .. |
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
11 .. ◕ A
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
12 .. |
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
13 .. ● O
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
14 .. }}}
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
15 ..
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
16 .. Marker exist from:
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
17 ..
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
18 .. * B (prune)
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
19 ..
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
20 .. Command run:
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
21 ..
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
22 .. * hg push -r O
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
23 .. * hg push
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
24 ..
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
25 .. Expected exchange:
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
26 ..
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
27 .. * B (prune)
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
28
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
29
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
30 $ setuprepos B.1
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
31 creating test repo for test case B.1
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
32 - pulldest
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
33 - main
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
34 - pushdest
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
35 cd into `main` and proceed with env setup
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
36 $ cd main
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
37 $ mkcommit A
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
38 $ mkcommit B
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
39 $ hg prune -qd '0 0' .
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
40 $ hg log -G --hidden
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
41 x f6fbb35d8ac9 (draft): B
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
42 |
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
43 @ f5bc6836db60 (draft): A
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
44 |
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
45 o a9bdc8b26820 (public): O
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
46
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
47 $ hg debugobsolete
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
48 f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {'date': '0 0', 'p1': 'f5bc6836db60e308a17ba08bf050154ba9c4fad7', 'user': 'test'}
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
49 $ cd ..
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
50 $ cd ..
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
51
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
52
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
53 $ cp -r B.1 B.1.a
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
54 $ cp -r B.1 B.1.b
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
55
984
b286f77d680c tests: fix grammar, spelling, punctuation in comments
Greg Ward <greg@gerg.ca>
parents: 957
diff changeset
56 Actual Test (explicit push version)
837
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
57 -----------------------------------
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
58
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
59 $ dotest B.1.a A
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
60 ## Running testcase B.1.a
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
61 # testing echange of "A" (f5bc6836db60)
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
62 ## initial state
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
63 # obstore: main
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
64 f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {'date': '0 0', 'p1': 'f5bc6836db60e308a17ba08bf050154ba9c4fad7', 'user': 'test'}
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
65 # obstore: pushdest
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
66 # obstore: pulldest
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
67 ## pushing "A" from main to pushdest
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
68 pushing to pushdest
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
69 searching for changes
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
70 adding changesets
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
71 adding manifests
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
72 adding file changes
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
73 added 1 changesets with 1 changes to 1 files
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
74 OBSEXC: computing relevant nodes
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
75 OBSEXC: computing markers relevant to 2 nodes
957
2cde59f3cb5d evolve: add a push pass using bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 956
diff changeset
76 OBSEXC: pushing 1 markers (89 bytes)
837
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
77 OBSEXC: DONE
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
78 ## post push state
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
79 # obstore: main
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
80 f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {'date': '0 0', 'p1': 'f5bc6836db60e308a17ba08bf050154ba9c4fad7', 'user': 'test'}
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
81 # obstore: pushdest
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
82 f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {'date': '0 0', 'p1': 'f5bc6836db60e308a17ba08bf050154ba9c4fad7', 'user': 'test'}
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
83 # obstore: pulldest
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
84 ## pulling "f5bc6836db60" from main into pulldest
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
85 pulling from main
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
86 searching for changes
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
87 adding changesets
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
88 adding manifests
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
89 adding file changes
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
90 added 1 changesets with 1 changes to 1 files
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
91 OBSEXC: pull obsolescence markers
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
92 OBSEXC: merging obsolescence markers (89 bytes)
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
93 OBSEXC: 1 markers added
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
94 OBSEXC: DONE
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
95 (run 'hg update' to get a working copy)
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
96 ## post pull state
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
97 # obstore: main
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
98 f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {'date': '0 0', 'p1': 'f5bc6836db60e308a17ba08bf050154ba9c4fad7', 'user': 'test'}
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
99 # obstore: pushdest
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
100 f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {'date': '0 0', 'p1': 'f5bc6836db60e308a17ba08bf050154ba9c4fad7', 'user': 'test'}
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
101 # obstore: pulldest
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
102 f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {'date': '0 0', 'p1': 'f5bc6836db60e308a17ba08bf050154ba9c4fad7', 'user': 'test'}
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
103
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
104 Actual Test (bare push version)
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
105 -----------------------------------
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
106
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
107 $ dotest B.1.b
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
108 ## Running testcase B.1.b
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
109 ## initial state
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
110 # obstore: main
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
111 f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {'date': '0 0', 'p1': 'f5bc6836db60e308a17ba08bf050154ba9c4fad7', 'user': 'test'}
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
112 # obstore: pushdest
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
113 # obstore: pulldest
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
114 ## pushing from main to pushdest
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
115 pushing to pushdest
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
116 searching for changes
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
117 adding changesets
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
118 adding manifests
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
119 adding file changes
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
120 added 1 changesets with 1 changes to 1 files
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
121 OBSEXC: computing relevant nodes
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
122 OBSEXC: computing markers relevant to 2 nodes
957
2cde59f3cb5d evolve: add a push pass using bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 956
diff changeset
123 OBSEXC: pushing 1 markers (89 bytes)
837
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
124 OBSEXC: DONE
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
125 ## post push state
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
126 # obstore: main
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
127 f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {'date': '0 0', 'p1': 'f5bc6836db60e308a17ba08bf050154ba9c4fad7', 'user': 'test'}
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
128 # obstore: pushdest
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
129 f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {'date': '0 0', 'p1': 'f5bc6836db60e308a17ba08bf050154ba9c4fad7', 'user': 'test'}
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
130 # obstore: pulldest
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
131 ## pulling from main into pulldest
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
132 pulling from main
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
133 searching for changes
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
134 adding changesets
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
135 adding manifests
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
136 adding file changes
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
137 added 1 changesets with 1 changes to 1 files
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
138 OBSEXC: pull obsolescence markers
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
139 OBSEXC: merging obsolescence markers (89 bytes)
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
140 OBSEXC: 1 markers added
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
141 OBSEXC: DONE
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
142 (run 'hg update' to get a working copy)
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
143 ## post pull state
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
144 # obstore: main
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
145 f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {'date': '0 0', 'p1': 'f5bc6836db60e308a17ba08bf050154ba9c4fad7', 'user': 'test'}
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
146 # obstore: pushdest
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
147 f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {'date': '0 0', 'p1': 'f5bc6836db60e308a17ba08bf050154ba9c4fad7', 'user': 'test'}
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
148 # obstore: pulldest
64f75c5c4f7f exchange: add test case for B.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
149 f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {'date': '0 0', 'p1': 'f5bc6836db60e308a17ba08bf050154ba9c4fad7', 'user': 'test'}