Mercurial Mercurial > hg-stable / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-transplant.out
author Adrian Buehlmann <adrian@cadifra.com>
Fri, 21 Mar 2008 14:52:24 +0100
changeset 6338 0750f11152fe
parent 6336 4b0c9c674707
child 6639 6334569c8caa
permissions -rw-r--r--
clone: print "updating working directory" status message With this change, "hg clone" looks like this: % hg clone http://example.com/repo/big big requesting all changes adding changesets adding manifests adding file changes added XXX changesets with XXX changes to XXX files updating working directory XXX files updated, XXX files merged, XXX files removed, XXX files unresolved So the user sees % hg clone http://example.com/repo/big big requesting all changes adding changesets adding manifests adding file changes added XXX changesets with XXX changes to XXX files updating working directory while Mercurial is writing to disk to populate the working directory With this change, "hg clone" looks like this: % hg clone big big-work updating working directory XXX files updated, XXX files merged, XXX files removed, XXX files unresolved
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
     1
 
adding r1
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
     2
 
adding r2
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
     3
 
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
     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
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
     6
 
adding b2
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
     7
 
adding b3
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
     8
 
4  b3
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
     9
 
3  b2
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    10
 
2 0:17ab29e464c6  b1
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    11
 
1  r2
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    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
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    14
 
4 files updated, 0 files merged, 0 files removed, 0 files unresolved
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    15
 
1 files updated, 0 files merged, 3 files removed, 0 files unresolved
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    16
 
% rebase b onto r1
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    17
 
applying 37a1297eb21b
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    18
 
37a1297eb21b transplanted to e234d668f844
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    19
 
applying 722f4667af76
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    20
 
722f4667af76 transplanted to 539f377d78df
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    21
 
applying a53251cdf717
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    22
 
a53251cdf717 transplanted to ffd6818a3975
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    23
 
7  b3
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    24
 
6  b2
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    25
 
5 1:d11e3596cc1a  b1
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    26
 
4  b3
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    27
 
3  b2
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    28
 
2 0:17ab29e464c6  b1
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    29
 
1  r2
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    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
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    32
 
4 files updated, 0 files merged, 0 files removed, 0 files unresolved
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    33
 
1 files updated, 0 files merged, 3 files removed, 0 files unresolved
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    34
 
% rebase b onto r1, skipping b2
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    35
 
applying 37a1297eb21b
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    36
 
37a1297eb21b transplanted to e234d668f844
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    37
 
applying a53251cdf717
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    38
 
a53251cdf717 transplanted to 7275fda4d04f
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    39
 
6  b3
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    40
 
5 1:d11e3596cc1a  b1
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    41
 
4  b3
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    42
 
3  b2
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    43
 
2 0:17ab29e464c6  b1
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    44
 
1  r2
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    45
 
0  r1
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    46
 
% remote transplant
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    47
 
requesting all changes
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    48
 
adding changesets
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    49
 
adding manifests
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    50
 
adding file changes
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    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
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    53
 
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    54
 
searching for changes
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    55
 
applying 37a1297eb21b
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    56
 
37a1297eb21b transplanted to c19cf0ccb069
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    57
 
applying a53251cdf717
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    58
 
a53251cdf717 transplanted to f7fe5bf98525
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    59
 
3  b3
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    60
 
(transplanted from a53251cdf717679d1907b289f991534be05c997a)
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    61
 
2  b1
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    62
 
(transplanted from 37a1297eb21b3ef5c5d2ffac22121a0988ed9f21)
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    63
 
1  r2
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    64
 
0  r1
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    65
 
% skip previous transplants
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    66
 
searching for changes
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    67
 
applying 722f4667af76
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    68
 
722f4667af76 transplanted to 47156cd86c0b
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    69
 
4  b2
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    70
 
3  b3
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    71
 
(transplanted from a53251cdf717679d1907b289f991534be05c997a)
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    72
 
2  b1
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    73
 
(transplanted from 37a1297eb21b3ef5c5d2ffac22121a0988ed9f21)
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    74
 
1  r2
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    75
 
0  r1
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    76
 
% skip local changes transplanted to the source
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    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
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    79
 
4 files updated, 0 files merged, 0 files removed, 0 files unresolved
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    80
 
searching for changes
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    81
 
applying 4333daefcb15
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    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
hg-stable