Mercurial > hg
comparison tests/test-fetch.out @ 7007:a6b74fbb5ce0
fetch: added support for named branches
Previously, fetch didn't really work when there were multiple named branches
in the repository. Now it tries to do the right thing(tm) in all situations.
author | Sune Foldager <cryo@cyanite.org> |
---|---|
date | Mon, 08 Sep 2008 12:55:46 +0200 |
parents | 0750f11152fe |
children | 6489ee64b522 |
comparison
equal
deleted
inserted
replaced
7006:92d44ec32430 | 7007:a6b74fbb5ce0 |
---|---|
1 % test fetch with default branches only | |
1 adding a | 2 adding a |
2 updating working directory | 3 updating working directory |
3 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 4 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
4 updating working directory | 5 updating working directory |
5 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 6 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
77 merging with 3:cc6a3744834d | 78 merging with 3:cc6a3744834d |
78 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 79 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
79 new changeset 4:55aa4f32ec59 merges remote changes with local | 80 new changeset 4:55aa4f32ec59 merges remote changes with local |
80 % should abort, because i is modified | 81 % should abort, because i is modified |
81 abort: working directory is missing some files | 82 abort: working directory is missing some files |
83 % test fetch with named branches | |
84 adding a | |
85 marked working directory as branch a | |
86 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
87 marked working directory as branch b | |
88 adding b | |
89 created new head | |
90 | |
91 % pull in change on foreign branch | |
92 updating working directory | |
93 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
94 updating working directory | |
95 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
96 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
97 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
98 pulling from n1 | |
99 searching for changes | |
100 adding changesets | |
101 adding manifests | |
102 adding file changes | |
103 added 1 changesets with 1 changes to 1 files | |
104 % parent should be 2 (no automatic update) | |
105 2 | |
106 | |
107 % pull in changes on both foreign and local branches | |
108 updating working directory | |
109 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
110 updating working directory | |
111 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
112 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
113 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
114 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
115 pulling from n1 | |
116 searching for changes | |
117 adding changesets | |
118 adding manifests | |
119 adding file changes | |
120 added 2 changesets with 2 changes to 2 files | |
121 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
122 % parent should be 4 (fast forward) | |
123 4 | |
124 | |
125 % pull changes on foreign (2 new heads) and local (1 new head) branches | |
126 % with a local change | |
127 updating working directory | |
128 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
129 updating working directory | |
130 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
131 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
132 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
133 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
134 created new head | |
135 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
136 adding c | |
137 pulling from n1 | |
138 searching for changes | |
139 adding changesets | |
140 adding manifests | |
141 adding file changes | |
142 added 3 changesets with 3 changes to 2 files (+2 heads) | |
143 updating to 5:708c6cce3d26 | |
144 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
145 merging with 3:d83427717b1f | |
146 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
147 new changeset 7:48f1a33f52af merges remote changes with local | |
148 % parent should be 7 (new merge changeset) | |
149 7 | |
150 % pull in changes on foreign (merge of local branch) and local (2 new | |
151 % heads) with a local change | |
152 updating working directory | |
153 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
154 updating working directory | |
155 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
156 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
157 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
158 (branch merge, don't forget to commit) | |
159 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
160 created new head | |
161 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
162 created new head | |
163 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
164 pulling from n1 | |
165 searching for changes | |
166 adding changesets | |
167 adding manifests | |
168 adding file changes | |
169 added 3 changesets with 2 changes to 1 files (+2 heads) | |
170 not merging with 1 other new branch heads (use "hg heads ." and "hg merge" to merge them) | |
171 % parent should be 3 (fetch did not merge anything) | |
172 3 |