79
80
new changeset 4:55aa4f32ec59 merges remote changes with local
80
81
% should abort, because i is modified
81
82
abort: working directory is missing some files
83
% test fetch with named branches
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
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
103
added 1 changesets with 1 changes to 1 files
104
% parent should be 2 (no automatic update)
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
116
searching for 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)
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
135
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
138
searching for 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)
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
161
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
163
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
165
searching for 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)
173
% pull in change on different branch than dirstate
175
updating working directory
176
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
177
marked working directory as branch topic
178
abort: working dir not at branch tip (use "hg update" to check out branch tip)
179
% parent should be 0 (fetch did not update or merge anything)