Mercurial Mercurial > hg / 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-bundle-vs-outgoing.out
author Matt Mackall <mpm@selenic.com>
Wed, 28 Apr 2010 13:45:21 -0500
branchstable
changeset 11031 409c0e4d79e9
parent 9821 7d2e9121ef4f
permissions -rw-r--r--
Merge with i18n
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
9821
7d2e9121ef4f bundle: add test for Issue1704
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset 
     1
 
% setup test repo1
7d2e9121ef4f bundle: add test for Issue1704
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset 
     2
 
adding foo.txt
7d2e9121ef4f bundle: add test for Issue1704
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset 
     3
 
rev 1
7d2e9121ef4f bundle: add test for Issue1704
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset 
     4
 
rev 2
7d2e9121ef4f bundle: add test for Issue1704
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset 
     5
 
rev 3
7d2e9121ef4f bundle: add test for Issue1704
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset 
     6
 
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
7d2e9121ef4f bundle: add test for Issue1704
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset 
     7
 
rev 4
7d2e9121ef4f bundle: add test for Issue1704
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset 
     8
 
rev 5
7d2e9121ef4f bundle: add test for Issue1704
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset 
     9
 
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
7d2e9121ef4f bundle: add test for Issue1704
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset 
    10
 
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
7d2e9121ef4f bundle: add test for Issue1704
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset 
    11
 
(branch merge, don't forget to commit)
7d2e9121ef4f bundle: add test for Issue1704
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset 
    12
 
rev 7
7d2e9121ef4f bundle: add test for Issue1704
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset 
    13
 
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
7d2e9121ef4f bundle: add test for Issue1704
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset 
    14
 
rev 8
7d2e9121ef4f bundle: add test for Issue1704
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset 
    15
 
% the story so far
7d2e9121ef4f bundle: add test for Issue1704
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset 
    16
 
@  8
7d2e9121ef4f bundle: add test for Issue1704
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset 
    17
 
|
7d2e9121ef4f bundle: add test for Issue1704
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset 
    18
 
| o  7
7d2e9121ef4f bundle: add test for Issue1704
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset 
    19
 
| |
7d2e9121ef4f bundle: add test for Issue1704
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset 
    20
 
| o  6
7d2e9121ef4f bundle: add test for Issue1704
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset 
    21
 
|/|
7d2e9121ef4f bundle: add test for Issue1704
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset 
    22
 
o |  5
7d2e9121ef4f bundle: add test for Issue1704
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset 
    23
 
| |
7d2e9121ef4f bundle: add test for Issue1704
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset 
    24
 
o |  4
7d2e9121ef4f bundle: add test for Issue1704
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset 
    25
 
| |
7d2e9121ef4f bundle: add test for Issue1704
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset 
    26
 
| o  3
7d2e9121ef4f bundle: add test for Issue1704
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset 
    27
 
| |
7d2e9121ef4f bundle: add test for Issue1704
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset 
    28
 
| o  2
7d2e9121ef4f bundle: add test for Issue1704
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset 
    29
 
|/
7d2e9121ef4f bundle: add test for Issue1704
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset 
    30
 
o  1
7d2e9121ef4f bundle: add test for Issue1704
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset 
    31
 
|
7d2e9121ef4f bundle: add test for Issue1704
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset 
    32
 
o  0
7d2e9121ef4f bundle: add test for Issue1704
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset 
    33
 












7d2e9121ef4f
bundle: add test for Issue1704



Peter Arrenbrecht <peter.arrenbrecht@gmail.com>


parents: 

diff
changeset




    34


% sanity check of outgoing: expect revs 4 5 6 7 8













7d2e9121ef4f
bundle: add test for Issue1704



Peter Arrenbrecht <peter.arrenbrecht@gmail.com>


parents: 

diff
changeset




    35


requesting all changes













7d2e9121ef4f
bundle: add test for Issue1704



Peter Arrenbrecht <peter.arrenbrecht@gmail.com>


parents: 

diff
changeset




    36


adding changesets













7d2e9121ef4f
bundle: add test for Issue1704



Peter Arrenbrecht <peter.arrenbrecht@gmail.com>


parents: 

diff
changeset




    37


adding manifests













7d2e9121ef4f
bundle: add test for Issue1704



Peter Arrenbrecht <peter.arrenbrecht@gmail.com>


parents: 

diff
changeset




    38


adding file changes













7d2e9121ef4f
bundle: add test for Issue1704



Peter Arrenbrecht <peter.arrenbrecht@gmail.com>


parents: 

diff
changeset




    39


added 4 changesets with 4 changes to 1 files













7d2e9121ef4f
bundle: add test for Issue1704



Peter Arrenbrecht <peter.arrenbrecht@gmail.com>


parents: 

diff
changeset




    40


updating to branch default













7d2e9121ef4f
bundle: add test for Issue1704



Peter Arrenbrecht <peter.arrenbrecht@gmail.com>


parents: 

diff
changeset




    41


1 files updated, 0 files merged, 0 files removed, 0 files unresolved













7d2e9121ef4f
bundle: add test for Issue1704



Peter Arrenbrecht <peter.arrenbrecht@gmail.com>


parents: 

diff
changeset




    42


comparing with ../repo2













7d2e9121ef4f
bundle: add test for Issue1704



Peter Arrenbrecht <peter.arrenbrecht@gmail.com>


parents: 

diff
changeset




    43


searching for changes













7d2e9121ef4f
bundle: add test for Issue1704



Peter Arrenbrecht <peter.arrenbrecht@gmail.com>


parents: 

diff
changeset




    44


4













7d2e9121ef4f
bundle: add test for Issue1704



Peter Arrenbrecht <peter.arrenbrecht@gmail.com>


parents: 

diff
changeset




    45


5













7d2e9121ef4f
bundle: add test for Issue1704



Peter Arrenbrecht <peter.arrenbrecht@gmail.com>


parents: 

diff
changeset




    46


6













7d2e9121ef4f
bundle: add test for Issue1704



Peter Arrenbrecht <peter.arrenbrecht@gmail.com>


parents: 

diff
changeset




    47


7













7d2e9121ef4f
bundle: add test for Issue1704



Peter Arrenbrecht <peter.arrenbrecht@gmail.com>


parents: 

diff
changeset




    48


8













7d2e9121ef4f
bundle: add test for Issue1704



Peter Arrenbrecht <peter.arrenbrecht@gmail.com>


parents: 

diff
changeset




    49


% test bundle (destination repo): expect 5 revisions













7d2e9121ef4f
bundle: add test for Issue1704



Peter Arrenbrecht <peter.arrenbrecht@gmail.com>


parents: 

diff
changeset




    50


searching for changes













7d2e9121ef4f
bundle: add test for Issue1704



Peter Arrenbrecht <peter.arrenbrecht@gmail.com>


parents: 

diff
changeset




    51


5 changesets found













7d2e9121ef4f
bundle: add test for Issue1704



Peter Arrenbrecht <peter.arrenbrecht@gmail.com>


parents: 

diff
changeset




    52


% test bundle (base revision): expect 5 revisions













7d2e9121ef4f
bundle: add test for Issue1704



Peter Arrenbrecht <peter.arrenbrecht@gmail.com>


parents: 

diff
changeset




    53


5 changesets found















Mercurial