equal
deleted
inserted
replaced
25 adding changesets |
25 adding changesets |
26 adding manifests |
26 adding manifests |
27 adding file changes |
27 adding file changes |
28 added 1 changesets with 1 changes to 1 files (+1 heads) |
28 added 1 changesets with 1 changes to 1 files (+1 heads) |
29 new changesets 107cefe13e42 |
29 new changesets 107cefe13e42 |
30 1 changesets became public |
30 1 local changesets became public |
31 abort: uncommitted changes |
31 abort: uncommitted changes |
32 [255] |
32 [255] |
33 $ hg --config extensions.strip= strip --no-backup tip |
33 $ hg --config extensions.strip= strip --no-backup tip |
34 $ hg co -qC tip |
34 $ hg co -qC tip |
35 |
35 |
57 adding changesets |
57 adding changesets |
58 adding manifests |
58 adding manifests |
59 adding file changes |
59 adding file changes |
60 added 1 changesets with 1 changes to 1 files (+1 heads) |
60 added 1 changesets with 1 changes to 1 files (+1 heads) |
61 new changesets 800c91d5bfc1 |
61 new changesets 800c91d5bfc1 |
62 1 changesets became public |
62 1 local changesets became public |
63 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
63 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
64 updated to "107cefe13e42: m" |
64 updated to "107cefe13e42: m" |
65 1 other heads for branch "default" |
65 1 other heads for branch "default" |
66 |
66 |
67 $ HGMERGE=true hg merge |
67 $ HGMERGE=true hg merge |
80 adding changesets |
80 adding changesets |
81 adding manifests |
81 adding manifests |
82 adding file changes |
82 adding file changes |
83 added 1 changesets with 1 changes to 1 files (-1 heads) |
83 added 1 changesets with 1 changes to 1 files (-1 heads) |
84 new changesets 483b76ad4309 |
84 new changesets 483b76ad4309 |
85 1 changesets became public |
85 1 local changesets became public |
86 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
86 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
87 |
87 |
88 Similarity between "hg update" and "hg pull -u" in handling bookmark |
88 Similarity between "hg update" and "hg pull -u" in handling bookmark |
89 ==================================================================== |
89 ==================================================================== |
90 |
90 |
109 adding manifests |
109 adding manifests |
110 adding file changes |
110 adding file changes |
111 added 1 changesets with 1 changes to 1 files |
111 added 1 changesets with 1 changes to 1 files |
112 adding remote bookmark active-after-pull |
112 adding remote bookmark active-after-pull |
113 new changesets f815b3da6163 |
113 new changesets f815b3da6163 |
114 1 changesets became public |
114 1 local changesets became public |
115 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
115 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
116 (activating bookmark active-after-pull) |
116 (activating bookmark active-after-pull) |
117 |
117 |
118 $ hg parents -q |
118 $ hg parents -q |
119 4:f815b3da6163 |
119 4:f815b3da6163 |
139 adding manifests |
139 adding manifests |
140 adding file changes |
140 adding file changes |
141 added 1 changesets with 1 changes to 1 files |
141 added 1 changesets with 1 changes to 1 files |
142 adding remote bookmark active-after-pull |
142 adding remote bookmark active-after-pull |
143 new changesets f815b3da6163 |
143 new changesets f815b3da6163 |
144 1 changesets became public |
144 1 local changesets became public |
145 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
145 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
146 (activating bookmark active-after-pull) |
146 (activating bookmark active-after-pull) |
147 |
147 |
148 $ hg parents -q |
148 $ hg parents -q |
149 4:f815b3da6163 |
149 4:f815b3da6163 |
178 adding changesets |
178 adding changesets |
179 adding manifests |
179 adding manifests |
180 adding file changes |
180 adding file changes |
181 added 2 changesets with 1 changes to 1 files |
181 added 2 changesets with 1 changes to 1 files |
182 new changesets f815b3da6163:b5e4babfaaa7 |
182 new changesets f815b3da6163:b5e4babfaaa7 |
183 1 changesets became public |
183 1 local changesets became public |
184 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
184 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
185 (leaving bookmark active-before-pull) |
185 (leaving bookmark active-before-pull) |
186 |
186 |
187 $ hg parents -q |
187 $ hg parents -q |
188 5:b5e4babfaaa7 |
188 5:b5e4babfaaa7 |
206 adding changesets |
206 adding changesets |
207 adding manifests |
207 adding manifests |
208 adding file changes |
208 adding file changes |
209 added 2 changesets with 1 changes to 1 files |
209 added 2 changesets with 1 changes to 1 files |
210 new changesets f815b3da6163:b5e4babfaaa7 |
210 new changesets f815b3da6163:b5e4babfaaa7 |
211 1 changesets became public |
211 1 local changesets became public |
212 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
212 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
213 (leaving bookmark active-before-pull) |
213 (leaving bookmark active-before-pull) |
214 |
214 |
215 $ hg parents -q |
215 $ hg parents -q |
216 5:b5e4babfaaa7 |
216 5:b5e4babfaaa7 |
234 adding changesets |
234 adding changesets |
235 adding manifests |
235 adding manifests |
236 adding file changes |
236 adding file changes |
237 added 2 changesets with 1 changes to 1 files |
237 added 2 changesets with 1 changes to 1 files |
238 new changesets f815b3da6163:b5e4babfaaa7 |
238 new changesets f815b3da6163:b5e4babfaaa7 |
239 1 changesets became public |
239 1 local changesets became public |
240 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
240 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
241 (leaving bookmark active-before-pull) |
241 (leaving bookmark active-before-pull) |
242 |
242 |
243 $ hg parents -q |
243 $ hg parents -q |
244 5:b5e4babfaaa7 |
244 5:b5e4babfaaa7 |