Mercurial > hg
annotate tests/test-transplant.out @ 6339:ed9b07a97587
util: check fileno() validity in win32 set_binary()
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Fri, 21 Mar 2008 21:56:55 +0100 |
parents | 0750f11152fe |
children | 6334569c8caa |
rev | line source |
---|---|
3714 | 1 adding r1 |
2 adding r2 | |
3 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
4 adding b1 | |
6336
4b0c9c674707
warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
4901
diff
changeset
|
5 created new head |
3714 | 6 adding b2 |
7 adding b3 | |
8 4 b3 | |
9 3 b2 | |
10 2 0:17ab29e464c6 b1 | |
11 1 r2 | |
12 0 r1 | |
6338
0750f11152fe
clone: print "updating working directory" status message
Adrian Buehlmann <adrian@cadifra.com>
parents:
6336
diff
changeset
|
13 updating working directory |
3714 | 14 4 files updated, 0 files merged, 0 files removed, 0 files unresolved |
15 1 files updated, 0 files merged, 3 files removed, 0 files unresolved | |
16 % rebase b onto r1 | |
17 applying 37a1297eb21b | |
18 37a1297eb21b transplanted to e234d668f844 | |
19 applying 722f4667af76 | |
20 722f4667af76 transplanted to 539f377d78df | |
21 applying a53251cdf717 | |
22 a53251cdf717 transplanted to ffd6818a3975 | |
23 7 b3 | |
24 6 b2 | |
25 5 1:d11e3596cc1a b1 | |
26 4 b3 | |
27 3 b2 | |
28 2 0:17ab29e464c6 b1 | |
29 1 r2 | |
30 0 r1 | |
6338
0750f11152fe
clone: print "updating working directory" status message
Adrian Buehlmann <adrian@cadifra.com>
parents:
6336
diff
changeset
|
31 updating working directory |
3714 | 32 4 files updated, 0 files merged, 0 files removed, 0 files unresolved |
33 1 files updated, 0 files merged, 3 files removed, 0 files unresolved | |
34 % rebase b onto r1, skipping b2 | |
35 applying 37a1297eb21b | |
36 37a1297eb21b transplanted to e234d668f844 | |
37 applying a53251cdf717 | |
38 a53251cdf717 transplanted to 7275fda4d04f | |
39 6 b3 | |
40 5 1:d11e3596cc1a b1 | |
41 4 b3 | |
42 3 b2 | |
43 2 0:17ab29e464c6 b1 | |
44 1 r2 | |
45 0 r1 | |
46 % remote transplant | |
47 requesting all changes | |
48 adding changesets | |
49 adding manifests | |
50 adding file changes | |
51 added 2 changesets with 2 changes to 2 files | |
6338
0750f11152fe
clone: print "updating working directory" status message
Adrian Buehlmann <adrian@cadifra.com>
parents:
6336
diff
changeset
|
52 updating working directory |
3714 | 53 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
54 searching for changes | |
55 applying 37a1297eb21b | |
56 37a1297eb21b transplanted to c19cf0ccb069 | |
57 applying a53251cdf717 | |
58 a53251cdf717 transplanted to f7fe5bf98525 | |
59 3 b3 | |
60 (transplanted from a53251cdf717679d1907b289f991534be05c997a) | |
61 2 b1 | |
62 (transplanted from 37a1297eb21b3ef5c5d2ffac22121a0988ed9f21) | |
63 1 r2 | |
64 0 r1 | |
65 % skip previous transplants | |
66 searching for changes | |
67 applying 722f4667af76 | |
68 722f4667af76 transplanted to 47156cd86c0b | |
69 4 b2 | |
70 3 b3 | |
71 (transplanted from a53251cdf717679d1907b289f991534be05c997a) | |
72 2 b1 | |
73 (transplanted from 37a1297eb21b3ef5c5d2ffac22121a0988ed9f21) | |
74 1 r2 | |
75 0 r1 | |
76 % skip local changes transplanted to the source | |
77 adding b4 | |
6338
0750f11152fe
clone: print "updating working directory" status message
Adrian Buehlmann <adrian@cadifra.com>
parents:
6336
diff
changeset
|
78 updating working directory |
3714 | 79 4 files updated, 0 files merged, 0 files removed, 0 files unresolved |
80 searching for changes | |
81 applying 4333daefcb15 | |
82 4333daefcb15 transplanted to 5f42c04e07cc | |
4036
ebf1a05f6479
Make test-transplant test pull case
Brendan Cully <brendan@kublai.com>
parents:
3758
diff
changeset
|
83 % remote transplant with pull |
ebf1a05f6479
Make test-transplant test pull case
Brendan Cully <brendan@kublai.com>
parents:
3758
diff
changeset
|
84 requesting all changes |
ebf1a05f6479
Make test-transplant test pull case
Brendan Cully <brendan@kublai.com>
parents:
3758
diff
changeset
|
85 adding changesets |
ebf1a05f6479
Make test-transplant test pull case
Brendan Cully <brendan@kublai.com>
parents:
3758
diff
changeset
|
86 adding manifests |
ebf1a05f6479
Make test-transplant test pull case
Brendan Cully <brendan@kublai.com>
parents:
3758
diff
changeset
|
87 adding file changes |
ebf1a05f6479
Make test-transplant test pull case
Brendan Cully <brendan@kublai.com>
parents:
3758
diff
changeset
|
88 added 1 changesets with 1 changes to 1 files |
6338
0750f11152fe
clone: print "updating working directory" status message
Adrian Buehlmann <adrian@cadifra.com>
parents:
6336
diff
changeset
|
89 updating working directory |
4036
ebf1a05f6479
Make test-transplant test pull case
Brendan Cully <brendan@kublai.com>
parents:
3758
diff
changeset
|
90 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
ebf1a05f6479
Make test-transplant test pull case
Brendan Cully <brendan@kublai.com>
parents:
3758
diff
changeset
|
91 searching for changes |
ebf1a05f6479
Make test-transplant test pull case
Brendan Cully <brendan@kublai.com>
parents:
3758
diff
changeset
|
92 searching for changes |
ebf1a05f6479
Make test-transplant test pull case
Brendan Cully <brendan@kublai.com>
parents:
3758
diff
changeset
|
93 adding changesets |
ebf1a05f6479
Make test-transplant test pull case
Brendan Cully <brendan@kublai.com>
parents:
3758
diff
changeset
|
94 adding manifests |
ebf1a05f6479
Make test-transplant test pull case
Brendan Cully <brendan@kublai.com>
parents:
3758
diff
changeset
|
95 adding file changes |
ebf1a05f6479
Make test-transplant test pull case
Brendan Cully <brendan@kublai.com>
parents:
3758
diff
changeset
|
96 added 1 changesets with 1 changes to 1 files |
ebf1a05f6479
Make test-transplant test pull case
Brendan Cully <brendan@kublai.com>
parents:
3758
diff
changeset
|
97 applying a53251cdf717 |
ebf1a05f6479
Make test-transplant test pull case
Brendan Cully <brendan@kublai.com>
parents:
3758
diff
changeset
|
98 a53251cdf717 transplanted to 8d9279348abb |
ebf1a05f6479
Make test-transplant test pull case
Brendan Cully <brendan@kublai.com>
parents:
3758
diff
changeset
|
99 2 b3 |
ebf1a05f6479
Make test-transplant test pull case
Brendan Cully <brendan@kublai.com>
parents:
3758
diff
changeset
|
100 1 b1 |
ebf1a05f6479
Make test-transplant test pull case
Brendan Cully <brendan@kublai.com>
parents:
3758
diff
changeset
|
101 0 r1 |
3724
ea523d6f5f1a
transplant: fix --continue; add --continue test
Brendan Cully <brendan@kublai.com>
parents:
3714
diff
changeset
|
102 % transplant --continue |
ea523d6f5f1a
transplant: fix --continue; add --continue test
Brendan Cully <brendan@kublai.com>
parents:
3714
diff
changeset
|
103 adding foo |
3726
752884db5037
transplant: recover added/removed files after failed application
Brendan Cully <brendan@kublai.com>
parents:
3724
diff
changeset
|
104 adding toremove |
752884db5037
transplant: recover added/removed files after failed application
Brendan Cully <brendan@kublai.com>
parents:
3724
diff
changeset
|
105 adding added |
752884db5037
transplant: recover added/removed files after failed application
Brendan Cully <brendan@kublai.com>
parents:
3724
diff
changeset
|
106 removing toremove |
3724
ea523d6f5f1a
transplant: fix --continue; add --continue test
Brendan Cully <brendan@kublai.com>
parents:
3714
diff
changeset
|
107 adding bar |
3726
752884db5037
transplant: recover added/removed files after failed application
Brendan Cully <brendan@kublai.com>
parents:
3724
diff
changeset
|
108 2 files updated, 0 files merged, 2 files removed, 0 files unresolved |
6336
4b0c9c674707
warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
4901
diff
changeset
|
109 created new head |
3726
752884db5037
transplant: recover added/removed files after failed application
Brendan Cully <brendan@kublai.com>
parents:
3724
diff
changeset
|
110 applying a1e30dd1b8e7 |
4901
27414950abf5
Update test output to reflect small changes in patch chattiness.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4036
diff
changeset
|
111 patching file foo |
27414950abf5
Update test output to reflect small changes in patch chattiness.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4036
diff
changeset
|
112 Hunk #1 FAILED at 0 |
3724
ea523d6f5f1a
transplant: fix --continue; add --continue test
Brendan Cully <brendan@kublai.com>
parents:
3714
diff
changeset
|
113 1 out of 1 hunk FAILED -- saving rejects to file foo.rej |
4901
27414950abf5
Update test output to reflect small changes in patch chattiness.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4036
diff
changeset
|
114 patch failed to apply |
3724
ea523d6f5f1a
transplant: fix --continue; add --continue test
Brendan Cully <brendan@kublai.com>
parents:
3714
diff
changeset
|
115 abort: Fix up the merge and run hg transplant --continue |
3758
889f7e74a0d9
transplant: log source node when recovering too.
Brendan Cully <brendan@kublai.com>
parents:
3726
diff
changeset
|
116 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
889f7e74a0d9
transplant: log source node when recovering too.
Brendan Cully <brendan@kublai.com>
parents:
3726
diff
changeset
|
117 applying a1e30dd1b8e7 |
4901
27414950abf5
Update test output to reflect small changes in patch chattiness.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4036
diff
changeset
|
118 patching file foo |
27414950abf5
Update test output to reflect small changes in patch chattiness.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4036
diff
changeset
|
119 Hunk #1 FAILED at 0 |
3758
889f7e74a0d9
transplant: log source node when recovering too.
Brendan Cully <brendan@kublai.com>
parents:
3726
diff
changeset
|
120 1 out of 1 hunk FAILED -- saving rejects to file foo.rej |
4901
27414950abf5
Update test output to reflect small changes in patch chattiness.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4036
diff
changeset
|
121 patch failed to apply |
3758
889f7e74a0d9
transplant: log source node when recovering too.
Brendan Cully <brendan@kublai.com>
parents:
3726
diff
changeset
|
122 abort: Fix up the merge and run hg transplant --continue |
889f7e74a0d9
transplant: log source node when recovering too.
Brendan Cully <brendan@kublai.com>
parents:
3726
diff
changeset
|
123 a1e30dd1b8e7 transplanted as f1563cf27039 |
889f7e74a0d9
transplant: log source node when recovering too.
Brendan Cully <brendan@kublai.com>
parents:
3726
diff
changeset
|
124 skipping already applied revision 1:a1e30dd1b8e7 |
3726
752884db5037
transplant: recover added/removed files after failed application
Brendan Cully <brendan@kublai.com>
parents:
3724
diff
changeset
|
125 applying 1739ac5f6139 |
3758
889f7e74a0d9
transplant: log source node when recovering too.
Brendan Cully <brendan@kublai.com>
parents:
3726
diff
changeset
|
126 1739ac5f6139 transplanted to d649c221319f |
3726
752884db5037
transplant: recover added/removed files after failed application
Brendan Cully <brendan@kublai.com>
parents:
3724
diff
changeset
|
127 applying 0282d5fbbe02 |
3758
889f7e74a0d9
transplant: log source node when recovering too.
Brendan Cully <brendan@kublai.com>
parents:
3726
diff
changeset
|
128 0282d5fbbe02 transplanted to 77418277ccb3 |
3726
752884db5037
transplant: recover added/removed files after failed application
Brendan Cully <brendan@kublai.com>
parents:
3724
diff
changeset
|
129 added |
752884db5037
transplant: recover added/removed files after failed application
Brendan Cully <brendan@kublai.com>
parents:
3724
diff
changeset
|
130 bar |
752884db5037
transplant: recover added/removed files after failed application
Brendan Cully <brendan@kublai.com>
parents:
3724
diff
changeset
|
131 foo |