Show More
@@ -1,241 +1,191 b'' | |||
|
1 | 1 | $ HGMERGE=true; export HGMERGE |
|
2 | 2 | |
|
3 | 3 | $ hg init r1 |
|
4 | 4 | $ cd r1 |
|
5 | 5 | $ echo a > a |
|
6 | 6 | $ hg addremove |
|
7 | 7 | adding a |
|
8 | 8 | $ hg commit -m "1" |
|
9 | 9 | |
|
10 | 10 | $ hg clone . ../r2 |
|
11 | 11 | updating to branch default |
|
12 | 12 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
13 | 13 | $ cd ../r2 |
|
14 | 14 | $ hg up |
|
15 | 15 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
16 | 16 | $ echo abc > a |
|
17 | 17 | $ hg diff --nodates |
|
18 | 18 | diff -r c19d34741b0a a |
|
19 | 19 | --- a/a |
|
20 | 20 | +++ b/a |
|
21 | 21 | @@ -1,1 +1,1 @@ |
|
22 | 22 | -a |
|
23 | 23 | +abc |
|
24 | 24 | |
|
25 | 25 | $ cd ../r1 |
|
26 | 26 | $ echo b > b |
|
27 | 27 | $ echo a2 > a |
|
28 | 28 | $ hg addremove |
|
29 | 29 | adding b |
|
30 | 30 | $ hg commit -m "2" |
|
31 | 31 | |
|
32 | 32 | $ cd ../r2 |
|
33 | 33 | $ hg -q pull ../r1 |
|
34 | 34 | $ hg status |
|
35 | 35 | M a |
|
36 | 36 | $ hg parents |
|
37 | 37 | changeset: 0:c19d34741b0a |
|
38 | 38 | user: test |
|
39 | 39 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
40 | 40 | summary: 1 |
|
41 | 41 | |
|
42 | 42 | $ hg --debug up |
|
43 | 43 | searching for copies back to rev 1 |
|
44 | 44 | unmatched files in other: |
|
45 | 45 | b |
|
46 | 46 | resolving manifests |
|
47 | 47 | branchmerge: False, force: False, partial: False |
|
48 | 48 | ancestor: c19d34741b0a, local: c19d34741b0a+, remote: 1e71731e6fbb |
|
49 | 49 | preserving a for resolve of a |
|
50 | 50 | b: remote created -> g |
|
51 | 51 | getting b |
|
52 | 52 | updating: b 1/2 files (50.00%) |
|
53 | 53 | a: versions differ -> m |
|
54 | 54 | updating: a 2/2 files (100.00%) |
|
55 | 55 | picked tool 'true' for a (binary False symlink False) |
|
56 | 56 | merging a |
|
57 | 57 | my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a |
|
58 | 58 | 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
59 | 59 | $ hg parents |
|
60 | 60 | changeset: 1:1e71731e6fbb |
|
61 | 61 | tag: tip |
|
62 | 62 | user: test |
|
63 | 63 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
64 | 64 | summary: 2 |
|
65 | 65 | |
|
66 | 66 | $ hg --debug up 0 |
|
67 | 67 | resolving manifests |
|
68 | 68 | branchmerge: False, force: False, partial: False |
|
69 | 69 | ancestor: 1e71731e6fbb, local: 1e71731e6fbb+, remote: c19d34741b0a |
|
70 | 70 | preserving a for resolve of a |
|
71 | 71 | b: other deleted -> r |
|
72 | 72 | removing b |
|
73 | 73 | updating: b 1/2 files (50.00%) |
|
74 | 74 | a: versions differ -> m |
|
75 | 75 | updating: a 2/2 files (100.00%) |
|
76 | 76 | picked tool 'true' for a (binary False symlink False) |
|
77 | 77 | merging a |
|
78 | 78 | my a@1e71731e6fbb+ other a@c19d34741b0a ancestor a@1e71731e6fbb |
|
79 | 79 | 0 files updated, 1 files merged, 1 files removed, 0 files unresolved |
|
80 | 80 | $ hg parents |
|
81 | 81 | changeset: 0:c19d34741b0a |
|
82 | 82 | user: test |
|
83 | 83 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
84 | 84 | summary: 1 |
|
85 | 85 | |
|
86 | $ hg --debug merge | |
|
87 | abort: nothing to merge | |
|
88 | (use 'hg update' instead) | |
|
89 | [255] | |
|
90 | 86 | $ hg parents |
|
91 | 87 | changeset: 0:c19d34741b0a |
|
92 | 88 | user: test |
|
93 | 89 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
94 | 90 | summary: 1 |
|
95 | 91 | |
|
96 | 92 | $ hg --debug up |
|
97 | 93 | searching for copies back to rev 1 |
|
98 | 94 | unmatched files in other: |
|
99 | 95 | b |
|
100 | 96 | resolving manifests |
|
101 | 97 | branchmerge: False, force: False, partial: False |
|
102 | 98 | ancestor: c19d34741b0a, local: c19d34741b0a+, remote: 1e71731e6fbb |
|
103 | 99 | preserving a for resolve of a |
|
104 | 100 | b: remote created -> g |
|
105 | 101 | getting b |
|
106 | 102 | updating: b 1/2 files (50.00%) |
|
107 | 103 | a: versions differ -> m |
|
108 | 104 | updating: a 2/2 files (100.00%) |
|
109 | 105 | picked tool 'true' for a (binary False symlink False) |
|
110 | 106 | merging a |
|
111 | 107 | my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a |
|
112 | 108 | 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
113 | 109 | $ hg parents |
|
114 | 110 | changeset: 1:1e71731e6fbb |
|
115 | 111 | tag: tip |
|
116 | 112 | user: test |
|
117 | 113 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
118 | 114 | summary: 2 |
|
119 | 115 | |
|
120 | 116 | $ hg -v history |
|
121 | 117 | changeset: 1:1e71731e6fbb |
|
122 | 118 | tag: tip |
|
123 | 119 | user: test |
|
124 | 120 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
125 | 121 | files: a b |
|
126 | 122 | description: |
|
127 | 123 | 2 |
|
128 | 124 | |
|
129 | 125 | |
|
130 | 126 | changeset: 0:c19d34741b0a |
|
131 | 127 | user: test |
|
132 | 128 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
133 | 129 | files: a |
|
134 | 130 | description: |
|
135 | 131 | 1 |
|
136 | 132 | |
|
137 | 133 | |
|
138 | 134 | $ hg diff --nodates |
|
139 | 135 | diff -r 1e71731e6fbb a |
|
140 | 136 | --- a/a |
|
141 | 137 | +++ b/a |
|
142 | 138 | @@ -1,1 +1,1 @@ |
|
143 | 139 | -a2 |
|
144 | 140 | +abc |
|
145 | 141 | |
|
146 | 142 | |
|
147 | 143 | create a second head |
|
148 | 144 | |
|
149 | 145 | $ cd ../r1 |
|
150 | 146 | $ hg up 0 |
|
151 | 147 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
152 | 148 | $ echo b2 > b |
|
153 | 149 | $ echo a3 > a |
|
154 | 150 | $ hg addremove |
|
155 | 151 | adding b |
|
156 | 152 | $ hg commit -m "3" |
|
157 | 153 | created new head |
|
158 | 154 | |
|
159 | 155 | $ cd ../r2 |
|
160 | 156 | $ hg -q pull ../r1 |
|
161 | 157 | $ hg status |
|
162 | 158 | M a |
|
163 | 159 | $ hg parents |
|
164 | 160 | changeset: 1:1e71731e6fbb |
|
165 | 161 | user: test |
|
166 | 162 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
167 | 163 | summary: 2 |
|
168 | 164 | |
|
169 | 165 | $ hg --debug up |
|
170 | 166 | abort: uncommitted changes |
|
171 | 167 | (commit and merge, or update --clean to discard changes) |
|
172 | 168 | [255] |
|
173 | $ hg --debug merge | |
|
174 | abort: uncommitted changes | |
|
175 | (use 'hg status' to list changes) | |
|
176 | [255] | |
|
177 | $ hg --debug merge -f | |
|
178 | searching for copies back to rev 1 | |
|
179 | unmatched files new in both: | |
|
180 | b | |
|
181 | resolving manifests | |
|
182 | branchmerge: True, force: True, partial: False | |
|
183 | ancestor: c19d34741b0a, local: 1e71731e6fbb+, remote: 83c51d0caff4 | |
|
184 | preserving a for resolve of a | |
|
185 | preserving b for resolve of b | |
|
186 | a: versions differ -> m | |
|
187 | updating: a 1/2 files (50.00%) | |
|
188 | picked tool 'true' for a (binary False symlink False) | |
|
189 | merging a | |
|
190 | my a@1e71731e6fbb+ other a@83c51d0caff4 ancestor a@c19d34741b0a | |
|
191 | b: both created -> m | |
|
192 | updating: b 2/2 files (100.00%) | |
|
193 | picked tool 'true' for b (binary False symlink False) | |
|
194 | merging b | |
|
195 | my b@1e71731e6fbb+ other b@83c51d0caff4 ancestor b@000000000000 | |
|
196 | 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | |
|
197 | (branch merge, don't forget to commit) | |
|
198 | $ hg parents | |
|
199 | changeset: 1:1e71731e6fbb | |
|
200 | user: test | |
|
201 | date: Thu Jan 01 00:00:00 1970 +0000 | |
|
202 | summary: 2 | |
|
203 | ||
|
204 | changeset: 2:83c51d0caff4 | |
|
205 | tag: tip | |
|
206 | parent: 0:c19d34741b0a | |
|
207 | user: test | |
|
208 | date: Thu Jan 01 00:00:00 1970 +0000 | |
|
209 | summary: 3 | |
|
210 | ||
|
211 | $ hg diff --nodates | |
|
212 | diff -r 1e71731e6fbb a | |
|
213 | --- a/a | |
|
214 | +++ b/a | |
|
215 | @@ -1,1 +1,1 @@ | |
|
216 | -a2 | |
|
217 | +abc | |
|
218 | ||
|
219 | 169 | |
|
220 | 170 | test a local add |
|
221 | 171 | |
|
222 | 172 | $ cd .. |
|
223 | 173 | $ hg init a |
|
224 | 174 | $ hg init b |
|
225 | 175 | $ echo a > a/a |
|
226 | 176 | $ echo a > b/a |
|
227 | 177 | $ hg --cwd a commit -A -m a |
|
228 | 178 | adding a |
|
229 | 179 | $ cd b |
|
230 | 180 | $ hg add a |
|
231 | 181 | $ hg pull -u ../a |
|
232 | 182 | pulling from ../a |
|
233 | 183 | requesting all changes |
|
234 | 184 | adding changesets |
|
235 | 185 | adding manifests |
|
236 | 186 | adding file changes |
|
237 | 187 | added 1 changesets with 1 changes to 1 files |
|
238 | 188 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
239 | 189 | $ hg st |
|
240 | 190 | |
|
241 | 191 | $ cd .. |
General Comments 0
You need to be logged in to leave comments.
Login now