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-fetch.out
author David Soria Parra <dsp@php.net>
Sun, 20 Jun 2010 12:26:48 +0200
branchstable
changeset 11431 cac256790aa4
parent 11317 b66e414d38b0
permissions -rw-r--r--
bookmarks: Add -B option to incoming/outgoing to compare bookmarks We add a -B/--bookmarks option to hg incmoing and hg outgoing. If the option is passed we compare bookmarks instead of changesets. This can be used to see which bookmarks do not exists on the remote site.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
7007
a6b74fbb5ce0 fetch: added support for named branches
Sune Foldager <cryo@cyanite.org>
parents: 6338
diff changeset 
     1
 
% test fetch with default branches only
2822
4f7abf341cd4 fetch: fix breakage from mpm.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
     2
 
adding a
9611
a3d73b3e1f8a hg.clone: report branch name on update
Adrian Buehlmann <adrian@cadifra.com>
parents: 9093
diff changeset 
     3
 
updating to branch default
2822
4f7abf341cd4 fetch: fix breakage from mpm.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
     4
 
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
9611
a3d73b3e1f8a hg.clone: report branch name on update
Adrian Buehlmann <adrian@cadifra.com>
parents: 9093
diff changeset 
     5
 
updating to branch default
2822
4f7abf341cd4 fetch: fix breakage from mpm.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
     6
 
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
4f7abf341cd4 fetch: fix breakage from mpm.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
     7
 
adding b
4f7abf341cd4 fetch: fix breakage from mpm.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
     8
 
1:97d72e5f12c7
4f7abf341cd4 fetch: fix breakage from mpm.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
     9
 
% should pull one change
4f7abf341cd4 fetch: fix breakage from mpm.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    10
 
pulling from ../a
4f7abf341cd4 fetch: fix breakage from mpm.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    11
 
searching for changes
4f7abf341cd4 fetch: fix breakage from mpm.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    12
 
adding changesets
4f7abf341cd4 fetch: fix breakage from mpm.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    13
 
adding manifests
4f7abf341cd4 fetch: fix breakage from mpm.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    14
 
adding file changes
4f7abf341cd4 fetch: fix breakage from mpm.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    15
 
added 1 changesets with 1 changes to 1 files
4f7abf341cd4 fetch: fix breakage from mpm.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    16
 
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
4f7abf341cd4 fetch: fix breakage from mpm.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    17
 
1:97d72e5f12c7
4f7abf341cd4 fetch: fix breakage from mpm.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    18
 
adding c
9611
a3d73b3e1f8a hg.clone: report branch name on update
Adrian Buehlmann <adrian@cadifra.com>
parents: 9093
diff changeset 
    19
 
updating to branch default
5798
86f5d8f608b7 fetch: hide authentication details
Bryan O'Sullivan <bos@serpentine.com>
parents: 2823
diff changeset 
    20
 
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
9611
a3d73b3e1f8a hg.clone: report branch name on update
Adrian Buehlmann <adrian@cadifra.com>
parents: 9093
diff changeset 
    21
 
updating to branch default
5798
86f5d8f608b7 fetch: hide authentication details
Bryan O'Sullivan <bos@serpentine.com>
parents: 2823
diff changeset 
    22
 
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
6206
0b6f12495276 fetch: switch the default parent used for a merge
Bryan O'Sullivan <bos@serpentine.com>
parents: 5798
diff changeset 
    23
 
% should merge c into a
2822
4f7abf341cd4 fetch: fix breakage from mpm.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    24
 
pulling from ../a
4f7abf341cd4 fetch: fix breakage from mpm.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    25
 
searching for changes
4f7abf341cd4 fetch: fix breakage from mpm.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    26
 
adding changesets
4f7abf341cd4 fetch: fix breakage from mpm.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    27
 
adding manifests
4f7abf341cd4 fetch: fix breakage from mpm.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    28
 
adding file changes
4f7abf341cd4 fetch: fix breakage from mpm.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    29
 
added 1 changesets with 1 changes to 1 files (+1 heads)
6206
0b6f12495276 fetch: switch the default parent used for a merge
Bryan O'Sullivan <bos@serpentine.com>
parents: 5798
diff changeset 
    30
 
updating to 2:97d72e5f12c7
0b6f12495276 fetch: switch the default parent used for a merge
Bryan O'Sullivan <bos@serpentine.com>
parents: 5798
diff changeset 
    31
 
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
0b6f12495276 fetch: switch the default parent used for a merge
Bryan O'Sullivan <bos@serpentine.com>
parents: 5798
diff changeset 
    32
 
merging with 1:5e056962225c
2822
4f7abf341cd4 fetch: fix breakage from mpm.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    33
 
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
2823
e0caea53c997 test-fetch: make output stable
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2822
diff changeset 
    34
 
new changeset 3:cd3a41621cf0 merges remote changes with local
2822
4f7abf341cd4 fetch: fix breakage from mpm.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    35
 
a
4f7abf341cd4 fetch: fix breakage from mpm.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    36
 
b
4f7abf341cd4 fetch: fix breakage from mpm.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
    37
 
c
5798
86f5d8f608b7 fetch: hide authentication details
Bryan O'Sullivan <bos@serpentine.com>
parents: 2823
diff changeset 
    38
 
% fetch over http, no auth
10398
ace3cf2bc991 tests: don't just silently strip port numbers
Mads Kiilerich <mads@kiilerich.com>
parents: 9611
diff changeset 
    39
 
pulling from http://localhost:$HGPORT/
5798
86f5d8f608b7 fetch: hide authentication details
Bryan O'Sullivan <bos@serpentine.com>
parents: 2823
diff changeset 
    40
 
searching for changes
86f5d8f608b7 fetch: hide authentication details
Bryan O'Sullivan <bos@serpentine.com>
parents: 2823
diff changeset 
    41
 
adding changesets
86f5d8f608b7 fetch: hide authentication details
Bryan O'Sullivan <bos@serpentine.com>
parents: 2823
diff changeset 
    42
 
adding manifests
86f5d8f608b7 fetch: hide authentication details
Bryan O'Sullivan <bos@serpentine.com>
parents: 2823
diff changeset 
    43
 
adding file changes
86f5d8f608b7 fetch: hide authentication details
Bryan O'Sullivan <bos@serpentine.com>
parents: 2823
diff changeset 
    44
 
added 1 changesets with 1 changes to 1 files (+1 heads)
6206
0b6f12495276 fetch: switch the default parent used for a merge
Bryan O'Sullivan <bos@serpentine.com>
parents: 5798
diff changeset 
    45
 
updating to 2:97d72e5f12c7
0b6f12495276 fetch: switch the default parent used for a merge
Bryan O'Sullivan <bos@serpentine.com>
parents: 5798
diff changeset 
    46
 
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
0b6f12495276 fetch: switch the default parent used for a merge
Bryan O'Sullivan <bos@serpentine.com>
parents: 5798
diff changeset 
    47
 
merging with 1:5e056962225c
5798
86f5d8f608b7 fetch: hide authentication details
Bryan O'Sullivan <bos@serpentine.com>
parents: 2823
diff changeset 
    48
 
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
6246
35bf9c23e17a adjust test-fetch output to non-default HGPORT, e.g. with run-tests.py -j
Thomas Arendsen Hein <thomas@intevation.de>
parents: 6226
diff changeset 
    49
 
new changeset 3:... merges remote changes with local
10398
ace3cf2bc991 tests: don't just silently strip port numbers
Mads Kiilerich <mads@kiilerich.com>
parents: 9611
diff changeset 
    50
 
Automated merge with http://localhost:$HGPORT/
5798
86f5d8f608b7 fetch: hide authentication details
Bryan O'Sullivan <bos@serpentine.com>
parents: 2823
diff changeset 
    51
 
% fetch over http with auth (should be hidden in desc)
10398
ace3cf2bc991 tests: don't just silently strip port numbers
Mads Kiilerich <mads@kiilerich.com>
parents: 9611
diff changeset 
    52
 
pulling from http://user:***@localhost:$HGPORT/
5798
86f5d8f608b7 fetch: hide authentication details
Bryan O'Sullivan <bos@serpentine.com>
parents: 2823
diff changeset 
    53
 
searching for changes
86f5d8f608b7 fetch: hide authentication details
Bryan O'Sullivan <bos@serpentine.com>
parents: 2823
diff changeset 
    54
 
adding changesets
86f5d8f608b7 fetch: hide authentication details
Bryan O'Sullivan <bos@serpentine.com>
parents: 2823
diff changeset 
    55
 
adding manifests
86f5d8f608b7 fetch: hide authentication details
Bryan O'Sullivan <bos@serpentine.com>
parents: 2823
diff changeset 
    56
 
adding file changes
86f5d8f608b7 fetch: hide authentication details
Bryan O'Sullivan <bos@serpentine.com>
parents: 2823
diff changeset 
    57
 
added 1 changesets with 1 changes to 1 files (+1 heads)
6206
0b6f12495276 fetch: switch the default parent used for a merge
Bryan O'Sullivan <bos@serpentine.com>
parents: 5798
diff changeset 
    58
 
updating to 2:97d72e5f12c7
0b6f12495276 fetch: switch the default parent used for a merge
Bryan O'Sullivan <bos@serpentine.com>
parents: 5798
diff changeset 
    59
 
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
0b6f12495276 fetch: switch the default parent used for a merge
Bryan O'Sullivan <bos@serpentine.com>
parents: 5798
diff changeset 
    60
 
merging with 1:5e056962225c
5798
86f5d8f608b7 fetch: hide authentication details
Bryan O'Sullivan <bos@serpentine.com>
parents: 2823
diff changeset 
    61
 
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
6246
35bf9c23e17a adjust test-fetch output to non-default HGPORT, e.g. with run-tests.py -j
Thomas Arendsen Hein <thomas@intevation.de>
parents: 6226
diff changeset 
    62
 
new changeset 3:... merges remote changes with local
10398
ace3cf2bc991 tests: don't just silently strip port numbers
Mads Kiilerich <mads@kiilerich.com>
parents: 9611
diff changeset 
    63
 
Automated merge with http://localhost:$HGPORT/
9611
a3d73b3e1f8a hg.clone: report branch name on update
Adrian Buehlmann <adrian@cadifra.com>
parents: 9093
diff changeset 
    64
 
updating to branch default
6206
0b6f12495276 fetch: switch the default parent used for a merge
Bryan O'Sullivan <bos@serpentine.com>
parents: 5798
diff changeset 
    65
 
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
9611
a3d73b3e1f8a hg.clone: report branch name on update
Adrian Buehlmann <adrian@cadifra.com>
parents: 9093
diff changeset 
    66
 
updating to branch default
6206
0b6f12495276 fetch: switch the default parent used for a merge
Bryan O'Sullivan <bos@serpentine.com>
parents: 5798
diff changeset 
    67
 
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
0b6f12495276 fetch: switch the default parent used for a merge
Bryan O'Sullivan <bos@serpentine.com>
parents: 5798
diff changeset 
    68
 
adding f
0b6f12495276 fetch: switch the default parent used for a merge
Bryan O'Sullivan <bos@serpentine.com>
parents: 5798
diff changeset 
    69
 
adding g
0b6f12495276 fetch: switch the default parent used for a merge
Bryan O'Sullivan <bos@serpentine.com>
parents: 5798
diff changeset 
    70
 
% should merge f into g
0b6f12495276 fetch: switch the default parent used for a merge
Bryan O'Sullivan <bos@serpentine.com>
parents: 5798
diff changeset 
    71
 
pulling from ../f
0b6f12495276 fetch: switch the default parent used for a merge
Bryan O'Sullivan <bos@serpentine.com>
parents: 5798
diff changeset 
    72
 
searching for changes
0b6f12495276 fetch: switch the default parent used for a merge
Bryan O'Sullivan <bos@serpentine.com>
parents: 5798
diff changeset 
    73
 
adding changesets
0b6f12495276 fetch: switch the default parent used for a merge
Bryan O'Sullivan <bos@serpentine.com>
parents: 5798
diff changeset 
    74
 
adding manifests
0b6f12495276 fetch: switch the default parent used for a merge
Bryan O'Sullivan <bos@serpentine.com>
parents: 5798
diff changeset 
    75
 
adding file changes
0b6f12495276 fetch: switch the default parent used for a merge
Bryan O'Sullivan <bos@serpentine.com>
parents: 5798
diff changeset 
    76
 
added 1 changesets with 1 changes to 1 files (+1 heads)
0b6f12495276 fetch: switch the default parent used for a merge
Bryan O'Sullivan <bos@serpentine.com>
parents: 5798
diff changeset 
    77
 
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
0b6f12495276 fetch: switch the default parent used for a merge
Bryan O'Sullivan <bos@serpentine.com>
parents: 5798
diff changeset 
    78
 
merging with 3:cc6a3744834d
0b6f12495276 fetch: switch the default parent used for a merge
Bryan O'Sullivan <bos@serpentine.com>
parents: 5798
diff changeset 
    79
 
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
6207
03b13d853dc6 fetch: make test reproducible, tiny code cleanup
Bryan O'Sullivan <bos@serpentine.com>
parents: 6206
diff changeset 
    80
 
new changeset 4:55aa4f32ec59 merges remote changes with local
6226
bd61e44eb2cc fetch: don't proceed if working directory is missing files (issue988)
Bryan O'Sullivan <bos@serpentine.com>
parents: 6207
diff changeset 
    81
 
% should abort, because i is modified
bd61e44eb2cc fetch: don't proceed if working directory is missing files (issue988)
Bryan O'Sullivan <bos@serpentine.com>
parents: 6207
diff changeset 
    82
 
abort: working directory is missing some files
7007
a6b74fbb5ce0 fetch: added support for named branches
Sune Foldager <cryo@cyanite.org>
parents: 6338
diff changeset 
    83
 
% test fetch with named branches
a6b74fbb5ce0 fetch: added support for named branches
Sune Foldager <cryo@cyanite.org>
parents: 6338
diff changeset 
    84
 
adding a
a6b74fbb5ce0 fetch: added support for named branches
Sune Foldager <cryo@cyanite.org>
parents: 6338
diff changeset 
    85
 
marked working directory as branch a
a6b74fbb5ce0 fetch: added support for named branches
Sune Foldager <cryo@cyanite.org>
parents: 6338
diff changeset 
    86
 
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
a6b74fbb5ce0 fetch: added support for named branches
Sune Foldager <cryo@cyanite.org>
parents: 6338
diff changeset 
    87
 
marked working directory as branch b
a6b74fbb5ce0 fetch: added support for named branches
Sune Foldager <cryo@cyanite.org>
parents: 6338
diff changeset 
    88
 
adding b
a6b74fbb5ce0 fetch: added support for named branches
Sune Foldager <cryo@cyanite.org>
parents: 6338
diff changeset 
    89
 












a6b74fbb5ce0
fetch: added support for named branches



Sune Foldager <cryo@cyanite.org>


parents: 
6338

diff
changeset




    90


% pull in change on foreign branch








9611






a3d73b3e1f8a
hg.clone: report branch name on update



Adrian Buehlmann <adrian@cadifra.com>


parents: 
9093

diff
changeset




    91


updating to branch default








7007






a6b74fbb5ce0
fetch: added support for named branches



Sune Foldager <cryo@cyanite.org>


parents: 
6338

diff
changeset




    92


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








9611






a3d73b3e1f8a
hg.clone: report branch name on update



Adrian Buehlmann <adrian@cadifra.com>


parents: 
9093

diff
changeset




    93


updating to branch default








7007






a6b74fbb5ce0
fetch: added support for named branches



Sune Foldager <cryo@cyanite.org>


parents: 
6338

diff
changeset




    94


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













a6b74fbb5ce0
fetch: added support for named branches



Sune Foldager <cryo@cyanite.org>


parents: 
6338

diff
changeset




    95


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













a6b74fbb5ce0
fetch: added support for named branches



Sune Foldager <cryo@cyanite.org>


parents: 
6338

diff
changeset




    96


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













a6b74fbb5ce0
fetch: added support for named branches



Sune Foldager <cryo@cyanite.org>


parents: 
6338

diff
changeset




    97


pulling from n1













a6b74fbb5ce0
fetch: added support for named branches



Sune Foldager <cryo@cyanite.org>


parents: 
6338

diff
changeset




    98


searching for changes













a6b74fbb5ce0
fetch: added support for named branches



Sune Foldager <cryo@cyanite.org>


parents: 
6338

diff
changeset




    99


adding changesets













a6b74fbb5ce0
fetch: added support for named branches



Sune Foldager <cryo@cyanite.org>


parents: 
6338

diff
changeset




   100


adding manifests













a6b74fbb5ce0
fetch: added support for named branches



Sune Foldager <cryo@cyanite.org>


parents: 
6338

diff
changeset




   101


adding file changes








7415






6163ef936a00
protocol: use changegroupsubset() if possible (issue1389)



Benoit Boissinot <benoit.boissinot@ens-lyon.org>


parents: 
7233

diff
changeset




   102


added 1 changesets with 1 changes to 1 files








7007






a6b74fbb5ce0
fetch: added support for named branches



Sune Foldager <cryo@cyanite.org>


parents: 
6338

diff
changeset




   103


% parent should be 2 (no automatic update)













a6b74fbb5ce0
fetch: added support for named branches



Sune Foldager <cryo@cyanite.org>


parents: 
6338

diff
changeset




   104


2













a6b74fbb5ce0
fetch: added support for named branches



Sune Foldager <cryo@cyanite.org>


parents: 
6338

diff
changeset




   105














a6b74fbb5ce0
fetch: added support for named branches



Sune Foldager <cryo@cyanite.org>


parents: 
6338

diff
changeset




   106


% pull in changes on both foreign and local branches








9611






a3d73b3e1f8a
hg.clone: report branch name on update



Adrian Buehlmann <adrian@cadifra.com>


parents: 
9093

diff
changeset




   107


updating to branch default








7007






a6b74fbb5ce0
fetch: added support for named branches



Sune Foldager <cryo@cyanite.org>


parents: 
6338

diff
changeset




   108


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








9611






a3d73b3e1f8a
hg.clone: report branch name on update



Adrian Buehlmann <adrian@cadifra.com>


parents: 
9093

diff
changeset




   109


updating to branch default








7007






a6b74fbb5ce0
fetch: added support for named branches



Sune Foldager <cryo@cyanite.org>


parents: 
6338

diff
changeset




   110


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













a6b74fbb5ce0
fetch: added support for named branches



Sune Foldager <cryo@cyanite.org>


parents: 
6338

diff
changeset




   111


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













a6b74fbb5ce0
fetch: added support for named branches



Sune Foldager <cryo@cyanite.org>


parents: 
6338

diff
changeset




   112


2 files updated, 0 files merged, 0 files removed, 0 files unresolved













a6b74fbb5ce0
fetch: added support for named branches



Sune Foldager <cryo@cyanite.org>


parents: 
6338

diff
changeset




   113


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













a6b74fbb5ce0
fetch: added support for named branches



Sune Foldager <cryo@cyanite.org>


parents: 
6338

diff
changeset




   114


pulling from n1













a6b74fbb5ce0
fetch: added support for named branches



Sune Foldager <cryo@cyanite.org>


parents: 
6338

diff
changeset




   115


searching for changes













a6b74fbb5ce0
fetch: added support for named branches



Sune Foldager <cryo@cyanite.org>


parents: 
6338

diff
changeset




   116


adding changesets













a6b74fbb5ce0
fetch: added support for named branches



Sune Foldager <cryo@cyanite.org>


parents: 
6338

diff
changeset




   117


adding manifests













a6b74fbb5ce0
fetch: added support for named branches



Sune Foldager <cryo@cyanite.org>


parents: 
6338

diff
changeset




   118


adding file changes













a6b74fbb5ce0
fetch: added support for named branches



Sune Foldager <cryo@cyanite.org>


parents: 
6338

diff
changeset




   119


added 2 changesets with 2 changes to 2 files













a6b74fbb5ce0
fetch: added support for named branches



Sune Foldager <cryo@cyanite.org>


parents: 
6338

diff
changeset




   120


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













a6b74fbb5ce0
fetch: added support for named branches



Sune Foldager <cryo@cyanite.org>


parents: 
6338

diff
changeset




   121


% parent should be 4 (fast forward)













a6b74fbb5ce0
fetch: added support for named branches



Sune Foldager <cryo@cyanite.org>


parents: 
6338

diff
changeset




   122


4













a6b74fbb5ce0
fetch: added support for named branches



Sune Foldager <cryo@cyanite.org>


parents: 
6338

diff
changeset




   123














a6b74fbb5ce0
fetch: added support for named branches



Sune Foldager <cryo@cyanite.org>


parents: 
6338

diff
changeset




   124


% pull changes on foreign (2 new heads) and local (1 new head) branches













a6b74fbb5ce0
fetch: added support for named branches



Sune Foldager <cryo@cyanite.org>


parents: 
6338

diff
changeset




   125


% with a local change








9611






a3d73b3e1f8a
hg.clone: report branch name on update



Adrian Buehlmann <adrian@cadifra.com>


parents: 
9093

diff
changeset




   126


updating to branch default








7007






a6b74fbb5ce0
fetch: added support for named branches



Sune Foldager <cryo@cyanite.org>


parents: 
6338

diff
changeset




   127


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








9611






a3d73b3e1f8a
hg.clone: report branch name on update



Adrian Buehlmann <adrian@cadifra.com>


parents: 
9093

diff
changeset




   128


updating to branch default








7007






a6b74fbb5ce0
fetch: added support for named branches



Sune Foldager <cryo@cyanite.org>


parents: 
6338

diff
changeset




   129


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













a6b74fbb5ce0
fetch: added support for named branches



Sune Foldager <cryo@cyanite.org>


parents: 
6338

diff
changeset




   130


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













a6b74fbb5ce0
fetch: added support for named branches



Sune Foldager <cryo@cyanite.org>


parents: 
6338

diff
changeset




   131


2 files updated, 0 files merged, 0 files removed, 0 files unresolved













a6b74fbb5ce0
fetch: added support for named branches



Sune Foldager <cryo@cyanite.org>


parents: 
6338

diff
changeset




   132


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













a6b74fbb5ce0
fetch: added support for named branches



Sune Foldager <cryo@cyanite.org>


parents: 
6338

diff
changeset




   133


created new head













a6b74fbb5ce0
fetch: added support for named branches



Sune Foldager <cryo@cyanite.org>


parents: 
6338

diff
changeset




   134


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













a6b74fbb5ce0
fetch: added support for named branches



Sune Foldager <cryo@cyanite.org>


parents: 
6338

diff
changeset




   135


adding c













a6b74fbb5ce0
fetch: added support for named branches



Sune Foldager <cryo@cyanite.org>


parents: 
6338

diff
changeset




   136


pulling from n1













a6b74fbb5ce0
fetch: added support for named branches



Sune Foldager <cryo@cyanite.org>


parents: 
6338

diff
changeset




   137


searching for changes













a6b74fbb5ce0
fetch: added support for named branches



Sune Foldager <cryo@cyanite.org>


parents: 
6338

diff
changeset




   138


adding changesets













a6b74fbb5ce0
fetch: added support for named branches



Sune Foldager <cryo@cyanite.org>


parents: 
6338

diff
changeset




   139


adding manifests













a6b74fbb5ce0
fetch: added support for named branches



Sune Foldager <cryo@cyanite.org>


parents: 
6338

diff
changeset




   140


adding file changes













a6b74fbb5ce0
fetch: added support for named branches



Sune Foldager <cryo@cyanite.org>


parents: 
6338

diff
changeset




   141


added 3 changesets with 3 changes to 2 files (+2 heads)













a6b74fbb5ce0
fetch: added support for named branches



Sune Foldager <cryo@cyanite.org>


parents: 
6338

diff
changeset




   142


updating to 5:708c6cce3d26













a6b74fbb5ce0
fetch: added support for named branches



Sune Foldager <cryo@cyanite.org>


parents: 
6338

diff
changeset




   143


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













a6b74fbb5ce0
fetch: added support for named branches



Sune Foldager <cryo@cyanite.org>


parents: 
6338

diff
changeset




   144


merging with 3:d83427717b1f













a6b74fbb5ce0
fetch: added support for named branches



Sune Foldager <cryo@cyanite.org>


parents: 
6338

diff
changeset




   145


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













a6b74fbb5ce0
fetch: added support for named branches



Sune Foldager <cryo@cyanite.org>


parents: 
6338

diff
changeset




   146


new changeset 7:48f1a33f52af merges remote changes with local













a6b74fbb5ce0
fetch: added support for named branches



Sune Foldager <cryo@cyanite.org>


parents: 
6338

diff
changeset




   147


% parent should be 7 (new merge changeset)













a6b74fbb5ce0
fetch: added support for named branches



Sune Foldager <cryo@cyanite.org>


parents: 
6338

diff
changeset




   148


7













a6b74fbb5ce0
fetch: added support for named branches



Sune Foldager <cryo@cyanite.org>


parents: 
6338

diff
changeset




   149


% pull in changes on foreign (merge of local branch) and local (2 new













a6b74fbb5ce0
fetch: added support for named branches



Sune Foldager <cryo@cyanite.org>


parents: 
6338

diff
changeset




   150


% heads) with a local change








9611






a3d73b3e1f8a
hg.clone: report branch name on update



Adrian Buehlmann <adrian@cadifra.com>


parents: 
9093

diff
changeset




   151


updating to branch default








7007






a6b74fbb5ce0
fetch: added support for named branches



Sune Foldager <cryo@cyanite.org>


parents: 
6338

diff
changeset




   152


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








9611






a3d73b3e1f8a
hg.clone: report branch name on update



Adrian Buehlmann <adrian@cadifra.com>


parents: 
9093

diff
changeset




   153


updating to branch default








7007






a6b74fbb5ce0
fetch: added support for named branches



Sune Foldager <cryo@cyanite.org>


parents: 
6338

diff
changeset




   154


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













a6b74fbb5ce0
fetch: added support for named branches



Sune Foldager <cryo@cyanite.org>


parents: 
6338

diff
changeset




   155


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













a6b74fbb5ce0
fetch: added support for named branches



Sune Foldager <cryo@cyanite.org>


parents: 
6338

diff
changeset




   156


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













a6b74fbb5ce0
fetch: added support for named branches



Sune Foldager <cryo@cyanite.org>


parents: 
6338

diff
changeset




   157


(branch merge, don't forget to commit)













a6b74fbb5ce0
fetch: added support for named branches



Sune Foldager <cryo@cyanite.org>


parents: 
6338

diff
changeset




   158


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













a6b74fbb5ce0
fetch: added support for named branches



Sune Foldager <cryo@cyanite.org>


parents: 
6338

diff
changeset




   159


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













a6b74fbb5ce0
fetch: added support for named branches



Sune Foldager <cryo@cyanite.org>


parents: 
6338

diff
changeset




   160


created new head













a6b74fbb5ce0
fetch: added support for named branches



Sune Foldager <cryo@cyanite.org>


parents: 
6338

diff
changeset




   161


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













a6b74fbb5ce0
fetch: added support for named branches



Sune Foldager <cryo@cyanite.org>


parents: 
6338

diff
changeset




   162


pulling from n1













a6b74fbb5ce0
fetch: added support for named branches



Sune Foldager <cryo@cyanite.org>


parents: 
6338

diff
changeset




   163


searching for changes













a6b74fbb5ce0
fetch: added support for named branches



Sune Foldager <cryo@cyanite.org>


parents: 
6338

diff
changeset




   164


adding changesets













a6b74fbb5ce0
fetch: added support for named branches



Sune Foldager <cryo@cyanite.org>


parents: 
6338

diff
changeset




   165


adding manifests













a6b74fbb5ce0
fetch: added support for named branches



Sune Foldager <cryo@cyanite.org>


parents: 
6338

diff
changeset




   166


adding file changes













a6b74fbb5ce0
fetch: added support for named branches



Sune Foldager <cryo@cyanite.org>


parents: 
6338

diff
changeset




   167


added 3 changesets with 2 changes to 1 files (+2 heads)













a6b74fbb5ce0
fetch: added support for named branches



Sune Foldager <cryo@cyanite.org>


parents: 
6338

diff
changeset




   168


not merging with 1 other new branch heads (use "hg heads ." and "hg merge" to merge them)













a6b74fbb5ce0
fetch: added support for named branches



Sune Foldager <cryo@cyanite.org>


parents: 
6338

diff
changeset




   169


% parent should be 3 (fetch did not merge anything)













a6b74fbb5ce0
fetch: added support for named branches



Sune Foldager <cryo@cyanite.org>


parents: 
6338

diff
changeset




   170


3








7049






6489ee64b522
fetch: use dirstate branch instead of first parents



Sune Foldager <cryo@cyanite.org>


parents: 
7007

diff
changeset




   171


% pull in change on different branch than dirstate













6489ee64b522
fetch: use dirstate branch instead of first parents



Sune Foldager <cryo@cyanite.org>


parents: 
7007

diff
changeset




   172


adding a








9611






a3d73b3e1f8a
hg.clone: report branch name on update



Adrian Buehlmann <adrian@cadifra.com>


parents: 
9093

diff
changeset




   173


updating to branch default








7049






6489ee64b522
fetch: use dirstate branch instead of first parents



Sune Foldager <cryo@cyanite.org>


parents: 
7007

diff
changeset




   174


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













6489ee64b522
fetch: use dirstate branch instead of first parents



Sune Foldager <cryo@cyanite.org>


parents: 
7007

diff
changeset




   175


marked working directory as branch topic













6489ee64b522
fetch: use dirstate branch instead of first parents



Sune Foldager <cryo@cyanite.org>


parents: 
7007

diff
changeset




   176


abort: working dir not at branch tip (use "hg update" to check out branch tip)













6489ee64b522
fetch: use dirstate branch instead of first parents



Sune Foldager <cryo@cyanite.org>


parents: 
7007

diff
changeset




   177


% parent should be 0 (fetch did not update or merge anything)













6489ee64b522
fetch: use dirstate branch instead of first parents



Sune Foldager <cryo@cyanite.org>


parents: 
7007

diff
changeset




   178


0








7855






aa1a87f7544f
regression test for issue1552



Benjamin Pollack <benjamin@bitquabit.com>


parents: 
7415

diff
changeset




   179


% test fetch with inactive branches













aa1a87f7544f
regression test for issue1552



Benjamin Pollack <benjamin@bitquabit.com>


parents: 
7415

diff
changeset




   180


adding a













aa1a87f7544f
regression test for issue1552



Benjamin Pollack <benjamin@bitquabit.com>


parents: 
7415

diff
changeset




   181


marked working directory as branch second













aa1a87f7544f
regression test for issue1552



Benjamin Pollack <benjamin@bitquabit.com>


parents: 
7415

diff
changeset




   182


adding b













aa1a87f7544f
regression test for issue1552



Benjamin Pollack <benjamin@bitquabit.com>


parents: 
7415

diff
changeset




   183


marked working directory as branch default













aa1a87f7544f
regression test for issue1552



Benjamin Pollack <benjamin@bitquabit.com>


parents: 
7415

diff
changeset




   184


adding c








11317






b66e414d38b0
commit: fix display of 'created new head' message (issue2186)



Gilles Moris <gilles.moris@free.fr>


parents: 
11181

diff
changeset




   185


created new head








9611






a3d73b3e1f8a
hg.clone: report branch name on update



Adrian Buehlmann <adrian@cadifra.com>


parents: 
9093

diff
changeset




   186


updating to branch default








7855






aa1a87f7544f
regression test for issue1552



Benjamin Pollack <benjamin@bitquabit.com>


parents: 
7415

diff
changeset




   187


3 files updated, 0 files merged, 0 files removed, 0 files unresolved













aa1a87f7544f
regression test for issue1552



Benjamin Pollack <benjamin@bitquabit.com>


parents: 
7415

diff
changeset




   188


% fetch should succeed













aa1a87f7544f
regression test for issue1552



Benjamin Pollack <benjamin@bitquabit.com>


parents: 
7415

diff
changeset




   189


pulling from ../ib1













aa1a87f7544f
regression test for issue1552



Benjamin Pollack <benjamin@bitquabit.com>


parents: 
7415

diff
changeset




   190


searching for changes













aa1a87f7544f
regression test for issue1552



Benjamin Pollack <benjamin@bitquabit.com>


parents: 
7415

diff
changeset




   191


no changes found








9093






0b2b269ba3d0
branch heads: fix regression introduced in e67e5b60e55f (issue1726)



Henrik Stuart <hg@hstuart.dk>


parents: 
7855

diff
changeset




   192


% test issue1726













0b2b269ba3d0
branch heads: fix regression introduced in e67e5b60e55f (issue1726)



Henrik Stuart <hg@hstuart.dk>


parents: 
7855

diff
changeset




   193


adding a








9611






a3d73b3e1f8a
hg.clone: report branch name on update



Adrian Buehlmann <adrian@cadifra.com>


parents: 
9093

diff
changeset




   194


updating to branch default








9093






0b2b269ba3d0
branch heads: fix regression introduced in e67e5b60e55f (issue1726)



Henrik Stuart <hg@hstuart.dk>


parents: 
7855

diff
changeset




   195


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













0b2b269ba3d0
branch heads: fix regression introduced in e67e5b60e55f (issue1726)



Henrik Stuart <hg@hstuart.dk>


parents: 
7855

diff
changeset




   196


pulling from ../i1726r1













0b2b269ba3d0
branch heads: fix regression introduced in e67e5b60e55f (issue1726)



Henrik Stuart <hg@hstuart.dk>


parents: 
7855

diff
changeset




   197


searching for changes













0b2b269ba3d0
branch heads: fix regression introduced in e67e5b60e55f (issue1726)



Henrik Stuart <hg@hstuart.dk>


parents: 
7855

diff
changeset




   198


adding changesets













0b2b269ba3d0
branch heads: fix regression introduced in e67e5b60e55f (issue1726)



Henrik Stuart <hg@hstuart.dk>


parents: 
7855

diff
changeset




   199


adding manifests













0b2b269ba3d0
branch heads: fix regression introduced in e67e5b60e55f (issue1726)



Henrik Stuart <hg@hstuart.dk>


parents: 
7855

diff
changeset




   200


adding file changes













0b2b269ba3d0
branch heads: fix regression introduced in e67e5b60e55f (issue1726)



Henrik Stuart <hg@hstuart.dk>


parents: 
7855

diff
changeset




   201


added 1 changesets with 1 changes to 1 files (+1 heads)













0b2b269ba3d0
branch heads: fix regression introduced in e67e5b60e55f (issue1726)



Henrik Stuart <hg@hstuart.dk>


parents: 
7855

diff
changeset




   202


updating to 2:7837755a2789













0b2b269ba3d0
branch heads: fix regression introduced in e67e5b60e55f (issue1726)



Henrik Stuart <hg@hstuart.dk>


parents: 
7855

diff
changeset




   203


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













0b2b269ba3d0
branch heads: fix regression introduced in e67e5b60e55f (issue1726)



Henrik Stuart <hg@hstuart.dk>


parents: 
7855

diff
changeset




   204


merging with 1:d1f0c6c48ebd













0b2b269ba3d0
branch heads: fix regression introduced in e67e5b60e55f (issue1726)



Henrik Stuart <hg@hstuart.dk>


parents: 
7855

diff
changeset




   205


merging a













0b2b269ba3d0
branch heads: fix regression introduced in e67e5b60e55f (issue1726)



Henrik Stuart <hg@hstuart.dk>


parents: 
7855

diff
changeset




   206


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













0b2b269ba3d0
branch heads: fix regression introduced in e67e5b60e55f (issue1726)



Henrik Stuart <hg@hstuart.dk>


parents: 
7855

diff
changeset




   207


new changeset 3 merges remote changes with local













0b2b269ba3d0
branch heads: fix regression introduced in e67e5b60e55f (issue1726)



Henrik Stuart <hg@hstuart.dk>


parents: 
7855

diff
changeset




   208


3








10580






612c142b7a82
fetch: fix newheads calculation (issue2047)



Sune Foldager <cryo@cyanite.org>


parents: 
10398

diff
changeset




   209














612c142b7a82
fetch: fix newheads calculation (issue2047)



Sune Foldager <cryo@cyanite.org>


parents: 
10398

diff
changeset




   210


% test issue2047








10581






3fb2f7cb5ea5
test-fetch: use relative URL to avoid echoing TMP path



Steve Borho <steve@borho.org>


parents: 
10580

diff
changeset




   211


pulling from ../i2047a








10580






612c142b7a82
fetch: fix newheads calculation (issue2047)



Sune Foldager <cryo@cyanite.org>


parents: 
10398

diff
changeset




   212


searching for changes













612c142b7a82
fetch: fix newheads calculation (issue2047)



Sune Foldager <cryo@cyanite.org>


parents: 
10398

diff
changeset




   213


adding changesets













612c142b7a82
fetch: fix newheads calculation (issue2047)



Sune Foldager <cryo@cyanite.org>


parents: 
10398

diff
changeset




   214


adding manifests













612c142b7a82
fetch: fix newheads calculation (issue2047)



Sune Foldager <cryo@cyanite.org>


parents: 
10398

diff
changeset




   215


adding file changes













612c142b7a82
fetch: fix newheads calculation (issue2047)



Sune Foldager <cryo@cyanite.org>


parents: 
10398

diff
changeset




   216


added 1 changesets with 1 changes to 1 files















Mercurial