File: test-hgnested.out

package info (click to toggle)
hgnested 0.5-3
  • links: PTS, VCS
  • area: main
  • in suites: wheezy
  • size: 168 kB
  • sloc: python: 280; sh: 79; makefile: 7
file content (328 lines) | stat: -rw-r--r-- 6,681 bytes parent folder | download | duplicates (2)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
# init repositories
adding .hgignore
adding d/d/f
adding f
adding f
adding f
adding f
adding f
# nclone
[toplevel-clone]
updating to branch default
3 files updated, 0 files merged, 0 files removed, 0 files unresolved

[toplevel-clone/d/d/r]
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved

[toplevel-clone/r]
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved

[toplevel-clone/r/r]
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved

[toplevel-clone/r2]
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved

# nincoming
[.]
comparing with $TESTTMP/toplevel
searching for changes
no changes found

[d/d/r]
comparing with $TESTTMP/toplevel/d/d/r
searching for changes
no changes found

[r]
comparing with $TESTTMP/toplevel/r
searching for changes
no changes found

[r/r]
comparing with $TESTTMP/toplevel/r/r
searching for changes
no changes found

[r2]
comparing with $TESTTMP/toplevel/r2
searching for changes
no changes found

# npull
[.]
pulling from $HGTMP//test-hgnested/toplevel
searching for changes
no changes found

[d/d/r]
pulling from $HGTMP//test-hgnested/toplevel/d/d/r
searching for changes
no changes found

[r]
pulling from $HGTMP//test-hgnested/toplevel/r
searching for changes
no changes found

[r/r]
pulling from $HGTMP//test-hgnested/toplevel/r/r
searching for changes
no changes found

[r2]
pulling from $HGTMP//test-hgnested/toplevel/r2
searching for changes
no changes found

adding f2
[.]
pulling from $HGTMP//test-hgnested/toplevel
searching for changes
no changes found

[d/d/r]
pulling from $HGTMP//test-hgnested/toplevel/d/d/r
searching for changes
no changes found

[r]
pulling from $HGTMP//test-hgnested/toplevel/r
searching for changes
no changes found

[r/r]
pulling from $HGTMP//test-hgnested/toplevel/r/r
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
(run 'hg update' to get a working copy)

[r2]
pulling from $HGTMP//test-hgnested/toplevel/r2
searching for changes
no changes found

# nupdate
[.]
0 files updated, 0 files merged, 0 files removed, 0 files unresolved

[d/d/r]
0 files updated, 0 files merged, 0 files removed, 0 files unresolved

[r]
0 files updated, 0 files merged, 0 files removed, 0 files unresolved

[r/r]
1 files updated, 0 files merged, 0 files removed, 0 files unresolved

[r2]
0 files updated, 0 files merged, 0 files removed, 0 files unresolved

# nstatus
[.]

[d/d/r]

[r]

[r/r]

[r2]

[.]
? f2

[d/d/r]

[r]
A f2

[r/r]
! f2

[r2]

# ndiff
diff -r 032a2c66592c r/f2
--- /dev/null
+++ b/r/f2
@@ -0,0 +1,1 @@
+f2
# noutgoing
adding f3
adding f3
adding f3
[.]
comparing with $TESTTMP/toplevel
searching for changes
changeset:   1:2e794a5d357a
tag:         tip
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     add f3


[d/d/r]
comparing with $TESTTMP/toplevel/d/d/r
searching for changes
changeset:   1:0dfff144d3ec
tag:         tip
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     add f3


[r]
comparing with $TESTTMP/toplevel/r
searching for changes
no changes found

[r/r]
comparing with $TESTTMP/toplevel/r/r
searching for changes
changeset:   2:f0c515605a0a
tag:         tip
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     add f3


[r2]
comparing with $TESTTMP/toplevel/r2
searching for changes
no changes found

# npush
[.]
pushing to $HGTMP//test-hgnested/toplevel
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files

[d/d/r]
pushing to $HGTMP//test-hgnested/toplevel/d/d/r
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files

[r]
pushing to $HGTMP//test-hgnested/toplevel/r
searching for changes
no changes found

[r/r]
pushing to $HGTMP//test-hgnested/toplevel/r/r
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files

[r2]
pushing to $HGTMP//test-hgnested/toplevel/r2
searching for changes
no changes found

# nclone ssh
[toplevel-sshclone]
requesting all changes
adding changesets
adding manifests
adding file changes
added 2 changesets with 4 changes to 4 files
updating to branch default
4 files updated, 0 files merged, 0 files removed, 0 files unresolved

[toplevel-sshclone/d/d/r]
requesting all changes
adding changesets
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files
updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved

[toplevel-sshclone/r]
requesting all changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved

[toplevel-sshclone/r/r]
requesting all changes
adding changesets
adding manifests
adding file changes
added 3 changesets with 3 changes to 3 files
updating to branch default
3 files updated, 0 files merged, 0 files removed, 0 files unresolved

[toplevel-sshclone/r2]
requesting all changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved

# nclone http
[toplevel-httpclone]
requesting all changes
adding changesets
adding manifests
adding file changes
added 2 changesets with 4 changes to 4 files
updating to branch default
4 files updated, 0 files merged, 0 files removed, 0 files unresolved

[toplevel-httpclone/d/d/r]
requesting all changes
adding changesets
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files
updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved

[toplevel-httpclone/r]
requesting all changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved

[toplevel-httpclone/r/r]
requesting all changes
adding changesets
adding manifests
adding file changes
added 3 changesets with 3 changes to 3 files
updating to branch default
3 files updated, 0 files merged, 0 files removed, 0 files unresolved

[toplevel-httpclone/r2]
requesting all changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved