tests/test-fetch.t
author Mads Kiilerich <mads@kiilerich.com>
Thu, 13 Oct 2011 04:27:49 +0200
changeset 15244 f6d5d01725db
parent 15243 1e9451476bf8
child 15446 c5c9ca3719f9
child 15615 41885892796e
permissions -rw-r--r--
tests: cleanup of test-fetch.t
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
12426
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
     1
  $ echo "[extensions]" >> $HGRCPATH
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
     2
  $ echo "fetch=" >> $HGRCPATH
6246
35bf9c23e17a adjust test-fetch output to non-default HGPORT, e.g. with run-tests.py -j
Thomas Arendsen Hein <thomas@intevation.de>
parents: 6235
diff changeset
     3
12426
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
     4
test fetch with default branches only
2822
4f7abf341cd4 fetch: fix breakage from mpm.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
     5
12426
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
     6
  $ hg init a
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
     7
  $ echo a > a/a
15244
f6d5d01725db tests: cleanup of test-fetch.t
Mads Kiilerich <mads@kiilerich.com>
parents: 15243
diff changeset
     8
  $ hg --cwd a commit -Ama
12426
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
     9
  adding a
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
    10
  $ hg clone a b
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
    11
  updating to branch default
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
    12
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
    13
  $ hg clone a c
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
    14
  updating to branch default
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
    15
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
    16
  $ echo b > a/b
15244
f6d5d01725db tests: cleanup of test-fetch.t
Mads Kiilerich <mads@kiilerich.com>
parents: 15243
diff changeset
    17
  $ hg --cwd a commit -Amb
12426
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
    18
  adding b
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
    19
  $ hg --cwd a parents -q
15244
f6d5d01725db tests: cleanup of test-fetch.t
Mads Kiilerich <mads@kiilerich.com>
parents: 15243
diff changeset
    20
  1:d2ae7f538514
2822
4f7abf341cd4 fetch: fix breakage from mpm.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
    21
12426
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
    22
should pull one change
2822
4f7abf341cd4 fetch: fix breakage from mpm.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
    23
12426
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
    24
  $ hg --cwd b fetch ../a
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
    25
  pulling from ../a
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
    26
  searching for changes
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
    27
  adding changesets
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
    28
  adding manifests
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
    29
  adding file changes
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
    30
  added 1 changesets with 1 changes to 1 files
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
    31
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
    32
  $ hg --cwd b parents -q
15244
f6d5d01725db tests: cleanup of test-fetch.t
Mads Kiilerich <mads@kiilerich.com>
parents: 15243
diff changeset
    33
  1:d2ae7f538514
12426
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
    34
  $ echo c > c/c
15244
f6d5d01725db tests: cleanup of test-fetch.t
Mads Kiilerich <mads@kiilerich.com>
parents: 15243
diff changeset
    35
  $ hg --cwd c commit -Amc
12426
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
    36
  adding c
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
    37
  $ hg clone c d
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
    38
  updating to branch default
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
    39
  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
    40
  $ hg clone c e
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
    41
  updating to branch default
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
    42
  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
2822
4f7abf341cd4 fetch: fix breakage from mpm.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
    43
12426
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
    44
We cannot use the default commit message if fetching from a local
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
    45
repo, because the path of the repo will be included in the commit
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
    46
message, making every commit appear different.
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
    47
should merge c into a
5798
86f5d8f608b7 fetch: hide authentication details
Bryan O'Sullivan <bos@serpentine.com>
parents: 2990
diff changeset
    48
15244
f6d5d01725db tests: cleanup of test-fetch.t
Mads Kiilerich <mads@kiilerich.com>
parents: 15243
diff changeset
    49
  $ hg --cwd c fetch -d '0 0' -m 'automated merge' ../a
12426
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
    50
  pulling from ../a
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
    51
  searching for changes
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
    52
  adding changesets
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
    53
  adding manifests
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
    54
  adding file changes
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
    55
  added 1 changesets with 1 changes to 1 files (+1 heads)
15244
f6d5d01725db tests: cleanup of test-fetch.t
Mads Kiilerich <mads@kiilerich.com>
parents: 15243
diff changeset
    56
  updating to 2:d2ae7f538514
12426
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
    57
  1 files updated, 0 files merged, 1 files removed, 0 files unresolved
15244
f6d5d01725db tests: cleanup of test-fetch.t
Mads Kiilerich <mads@kiilerich.com>
parents: 15243
diff changeset
    58
  merging with 1:d36c0562f908
12426
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
    59
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
15244
f6d5d01725db tests: cleanup of test-fetch.t
Mads Kiilerich <mads@kiilerich.com>
parents: 15243
diff changeset
    60
  new changeset 3:a323a0c43ec4 merges remote changes with local
12426
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
    61
  $ ls c
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
    62
  a
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
    63
  b
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
    64
  c
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
    65
  $ hg --cwd a serve -a localhost -p $HGPORT -d --pid-file=hg.pid
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
    66
  $ cat a/hg.pid >> "$DAEMON_PIDS"
5798
86f5d8f608b7 fetch: hide authentication details
Bryan O'Sullivan <bos@serpentine.com>
parents: 2990
diff changeset
    67
12426
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
    68
fetch over http, no auth
5798
86f5d8f608b7 fetch: hide authentication details
Bryan O'Sullivan <bos@serpentine.com>
parents: 2990
diff changeset
    69
15244
f6d5d01725db tests: cleanup of test-fetch.t
Mads Kiilerich <mads@kiilerich.com>
parents: 15243
diff changeset
    70
  $ hg --cwd d fetch http://localhost:$HGPORT/
12643
d08bb64888bc tests: reintroduce ":$HGPORT" in test output
Mads Kiilerich <mads@kiilerich.com>
parents: 12535
diff changeset
    71
  pulling from http://localhost:$HGPORT/
12426
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
    72
  searching for changes
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
    73
  adding changesets
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
    74
  adding manifests
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
    75
  adding file changes
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
    76
  added 1 changesets with 1 changes to 1 files (+1 heads)
15244
f6d5d01725db tests: cleanup of test-fetch.t
Mads Kiilerich <mads@kiilerich.com>
parents: 15243
diff changeset
    77
  updating to 2:d2ae7f538514
12426
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
    78
  1 files updated, 0 files merged, 1 files removed, 0 files unresolved
15244
f6d5d01725db tests: cleanup of test-fetch.t
Mads Kiilerich <mads@kiilerich.com>
parents: 15243
diff changeset
    79
  merging with 1:d36c0562f908
12426
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
    80
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
12535
975ec4ce961c tests: fix test-fetch port number variability
Matt Mackall <mpm@selenic.com>
parents: 12426
diff changeset
    81
  new changeset 3:* merges remote changes with local (glob)
12426
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
    82
  $ hg --cwd d tip --template '{desc}\n'
12643
d08bb64888bc tests: reintroduce ":$HGPORT" in test output
Mads Kiilerich <mads@kiilerich.com>
parents: 12535
diff changeset
    83
  Automated merge with http://localhost:$HGPORT/
6206
0b6f12495276 fetch: switch the default parent used for a merge
Bryan O'Sullivan <bos@serpentine.com>
parents: 5798
diff changeset
    84
12426
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
    85
fetch over http with auth (should be hidden in desc)
6206
0b6f12495276 fetch: switch the default parent used for a merge
Bryan O'Sullivan <bos@serpentine.com>
parents: 5798
diff changeset
    86
15244
f6d5d01725db tests: cleanup of test-fetch.t
Mads Kiilerich <mads@kiilerich.com>
parents: 15243
diff changeset
    87
  $ hg --cwd e fetch http://user:password@localhost:$HGPORT/
12643
d08bb64888bc tests: reintroduce ":$HGPORT" in test output
Mads Kiilerich <mads@kiilerich.com>
parents: 12535
diff changeset
    88
  pulling from http://user:***@localhost:$HGPORT/
12426
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
    89
  searching for changes
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
    90
  adding changesets
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
    91
  adding manifests
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
    92
  adding file changes
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
    93
  added 1 changesets with 1 changes to 1 files (+1 heads)
15244
f6d5d01725db tests: cleanup of test-fetch.t
Mads Kiilerich <mads@kiilerich.com>
parents: 15243
diff changeset
    94
  updating to 2:d2ae7f538514
12426
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
    95
  1 files updated, 0 files merged, 1 files removed, 0 files unresolved
15244
f6d5d01725db tests: cleanup of test-fetch.t
Mads Kiilerich <mads@kiilerich.com>
parents: 15243
diff changeset
    96
  merging with 1:d36c0562f908
12426
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
    97
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
12535
975ec4ce961c tests: fix test-fetch port number variability
Matt Mackall <mpm@selenic.com>
parents: 12426
diff changeset
    98
  new changeset 3:* merges remote changes with local (glob)
12426
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
    99
  $ hg --cwd e tip --template '{desc}\n'
12643
d08bb64888bc tests: reintroduce ":$HGPORT" in test output
Mads Kiilerich <mads@kiilerich.com>
parents: 12535
diff changeset
   100
  Automated merge with http://localhost:$HGPORT/
12426
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   101
  $ hg clone a f
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   102
  updating to branch default
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   103
  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   104
  $ hg clone a g
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   105
  updating to branch default
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   106
  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   107
  $ echo f > f/f
15244
f6d5d01725db tests: cleanup of test-fetch.t
Mads Kiilerich <mads@kiilerich.com>
parents: 15243
diff changeset
   108
  $ hg --cwd f ci -Amf
12426
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   109
  adding f
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   110
  $ echo g > g/g
15244
f6d5d01725db tests: cleanup of test-fetch.t
Mads Kiilerich <mads@kiilerich.com>
parents: 15243
diff changeset
   111
  $ hg --cwd g ci -Amg
12426
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   112
  adding g
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   113
  $ hg clone -q f h
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   114
  $ hg clone -q g i
6206
0b6f12495276 fetch: switch the default parent used for a merge
Bryan O'Sullivan <bos@serpentine.com>
parents: 5798
diff changeset
   115
12426
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   116
should merge f into g
6226
bd61e44eb2cc fetch: don't proceed if working directory is missing files (issue988)
Bryan O'Sullivan <bos@serpentine.com>
parents: 6207
diff changeset
   117
15244
f6d5d01725db tests: cleanup of test-fetch.t
Mads Kiilerich <mads@kiilerich.com>
parents: 15243
diff changeset
   118
  $ hg --cwd g fetch -d '0 0' --switch -m 'automated merge' ../f
12426
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   119
  pulling from ../f
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   120
  searching for changes
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   121
  adding changesets
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   122
  adding manifests
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   123
  adding file changes
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   124
  added 1 changesets with 1 changes to 1 files (+1 heads)
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   125
  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
15244
f6d5d01725db tests: cleanup of test-fetch.t
Mads Kiilerich <mads@kiilerich.com>
parents: 15243
diff changeset
   126
  merging with 3:6343ca3eff20
12426
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   127
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
15244
f6d5d01725db tests: cleanup of test-fetch.t
Mads Kiilerich <mads@kiilerich.com>
parents: 15243
diff changeset
   128
  new changeset 4:f7faa0b7d3c6 merges remote changes with local
12426
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   129
  $ rm i/g
6226
bd61e44eb2cc fetch: don't proceed if working directory is missing files (issue988)
Bryan O'Sullivan <bos@serpentine.com>
parents: 6207
diff changeset
   130
12426
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   131
should abort, because i is modified
6235
d16798000be0 test-fetch failed due to non-zero exit code
Thomas Arendsen Hein <thomas@intevation.de>
parents: 6226
diff changeset
   132
12426
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   133
  $ hg --cwd i fetch ../h
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   134
  abort: working directory is missing some files
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   135
  [255]
7007
a6b74fbb5ce0 fetch: added support for named branches
Sune Foldager <cryo@cyanite.org>
parents: 6246
diff changeset
   136
12426
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   137
test fetch with named branches
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   138
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   139
  $ hg init nbase
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   140
  $ echo base > nbase/a
15244
f6d5d01725db tests: cleanup of test-fetch.t
Mads Kiilerich <mads@kiilerich.com>
parents: 15243
diff changeset
   141
  $ hg -R nbase ci -Am base
12426
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   142
  adding a
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   143
  $ hg -R nbase branch a
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   144
  marked working directory as branch a
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   145
  $ echo a > nbase/a
15244
f6d5d01725db tests: cleanup of test-fetch.t
Mads Kiilerich <mads@kiilerich.com>
parents: 15243
diff changeset
   146
  $ hg -R nbase ci -m a
12426
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   147
  $ hg -R nbase up -C 0
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   148
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   149
  $ hg -R nbase branch b
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   150
  marked working directory as branch b
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   151
  $ echo b > nbase/b
15244
f6d5d01725db tests: cleanup of test-fetch.t
Mads Kiilerich <mads@kiilerich.com>
parents: 15243
diff changeset
   152
  $ hg -R nbase ci -Am b
12426
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   153
  adding b
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   154
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   155
pull in change on foreign branch
7007
a6b74fbb5ce0 fetch: added support for named branches
Sune Foldager <cryo@cyanite.org>
parents: 6246
diff changeset
   156
12426
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   157
  $ hg clone nbase n1
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   158
  updating to branch default
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   159
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   160
  $ hg clone nbase n2
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   161
  updating to branch default
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   162
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   163
  $ hg -R n1 up -C a
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   164
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   165
  $ echo aa > n1/a
15244
f6d5d01725db tests: cleanup of test-fetch.t
Mads Kiilerich <mads@kiilerich.com>
parents: 15243
diff changeset
   166
  $ hg -R n1 ci -m a1
12426
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   167
  $ hg -R n2 up -C b
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   168
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
15244
f6d5d01725db tests: cleanup of test-fetch.t
Mads Kiilerich <mads@kiilerich.com>
parents: 15243
diff changeset
   169
  $ hg -R n2 fetch -m 'merge' n1
12426
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   170
  pulling from n1
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   171
  searching for changes
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   172
  adding changesets
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   173
  adding manifests
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   174
  adding file changes
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   175
  added 1 changesets with 1 changes to 1 files
7007
a6b74fbb5ce0 fetch: added support for named branches
Sune Foldager <cryo@cyanite.org>
parents: 6246
diff changeset
   176
12426
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   177
parent should be 2 (no automatic update)
7007
a6b74fbb5ce0 fetch: added support for named branches
Sune Foldager <cryo@cyanite.org>
parents: 6246
diff changeset
   178
12426
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   179
  $ hg -R n2 parents --template '{rev}\n'
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   180
  2
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   181
  $ rm -fr n1 n2
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   182
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   183
pull in changes on both foreign and local branches
7007
a6b74fbb5ce0 fetch: added support for named branches
Sune Foldager <cryo@cyanite.org>
parents: 6246
diff changeset
   184
12426
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   185
  $ hg clone nbase n1
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   186
  updating to branch default
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   187
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   188
  $ hg clone nbase n2
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   189
  updating to branch default
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   190
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   191
  $ hg -R n1 up -C a
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   192
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   193
  $ echo aa > n1/a
15244
f6d5d01725db tests: cleanup of test-fetch.t
Mads Kiilerich <mads@kiilerich.com>
parents: 15243
diff changeset
   194
  $ hg -R n1 ci -m a1
12426
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   195
  $ hg -R n1 up -C b
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   196
  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   197
  $ echo bb > n1/b
15244
f6d5d01725db tests: cleanup of test-fetch.t
Mads Kiilerich <mads@kiilerich.com>
parents: 15243
diff changeset
   198
  $ hg -R n1 ci -m b1
12426
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   199
  $ hg -R n2 up -C b
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   200
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
15244
f6d5d01725db tests: cleanup of test-fetch.t
Mads Kiilerich <mads@kiilerich.com>
parents: 15243
diff changeset
   201
  $ hg -R n2 fetch -m 'merge' n1
12426
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   202
  pulling from n1
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   203
  searching for changes
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   204
  adding changesets
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   205
  adding manifests
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   206
  adding file changes
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   207
  added 2 changesets with 2 changes to 2 files
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   208
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
7007
a6b74fbb5ce0 fetch: added support for named branches
Sune Foldager <cryo@cyanite.org>
parents: 6246
diff changeset
   209
12426
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   210
parent should be 4 (fast forward)
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   211
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   212
  $ hg -R n2 parents --template '{rev}\n'
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   213
  4
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   214
  $ rm -fr n1 n2
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   215
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   216
pull changes on foreign (2 new heads) and local (1 new head) branches
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   217
with a local change
7007
a6b74fbb5ce0 fetch: added support for named branches
Sune Foldager <cryo@cyanite.org>
parents: 6246
diff changeset
   218
12426
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   219
  $ hg clone nbase n1
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   220
  updating to branch default
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   221
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   222
  $ hg clone nbase n2
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   223
  updating to branch default
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   224
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   225
  $ hg -R n1 up -C a
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   226
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   227
  $ echo a1 > n1/a
15244
f6d5d01725db tests: cleanup of test-fetch.t
Mads Kiilerich <mads@kiilerich.com>
parents: 15243
diff changeset
   228
  $ hg -R n1 ci -m a1
12426
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   229
  $ hg -R n1 up -C b
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   230
  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   231
  $ echo bb > n1/b
15244
f6d5d01725db tests: cleanup of test-fetch.t
Mads Kiilerich <mads@kiilerich.com>
parents: 15243
diff changeset
   232
  $ hg -R n1 ci -m b1
12426
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   233
  $ hg -R n1 up -C 1
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   234
  1 files updated, 0 files merged, 1 files removed, 0 files unresolved
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   235
  $ echo a2 > n1/a
15244
f6d5d01725db tests: cleanup of test-fetch.t
Mads Kiilerich <mads@kiilerich.com>
parents: 15243
diff changeset
   236
  $ hg -R n1 ci -m a2
12426
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   237
  created new head
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   238
  $ hg -R n2 up -C b
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   239
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   240
  $ echo change >> n2/c
15244
f6d5d01725db tests: cleanup of test-fetch.t
Mads Kiilerich <mads@kiilerich.com>
parents: 15243
diff changeset
   241
  $ hg -R n2 ci -A -m local
12426
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   242
  adding c
15244
f6d5d01725db tests: cleanup of test-fetch.t
Mads Kiilerich <mads@kiilerich.com>
parents: 15243
diff changeset
   243
  $ hg -R n2 fetch -d '0 0' -m 'merge' n1
12426
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   244
  pulling from n1
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   245
  searching for changes
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   246
  adding changesets
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   247
  adding manifests
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   248
  adding file changes
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   249
  added 3 changesets with 3 changes to 2 files (+2 heads)
15244
f6d5d01725db tests: cleanup of test-fetch.t
Mads Kiilerich <mads@kiilerich.com>
parents: 15243
diff changeset
   250
  updating to 5:3c4a837a864f
12426
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   251
  1 files updated, 0 files merged, 1 files removed, 0 files unresolved
15244
f6d5d01725db tests: cleanup of test-fetch.t
Mads Kiilerich <mads@kiilerich.com>
parents: 15243
diff changeset
   252
  merging with 3:1267f84a9ea5
12426
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   253
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
15244
f6d5d01725db tests: cleanup of test-fetch.t
Mads Kiilerich <mads@kiilerich.com>
parents: 15243
diff changeset
   254
  new changeset 7:2cf2a1261f21 merges remote changes with local
7007
a6b74fbb5ce0 fetch: added support for named branches
Sune Foldager <cryo@cyanite.org>
parents: 6246
diff changeset
   255
12426
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   256
parent should be 7 (new merge changeset)
7007
a6b74fbb5ce0 fetch: added support for named branches
Sune Foldager <cryo@cyanite.org>
parents: 6246
diff changeset
   257
12426
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   258
  $ hg -R n2 parents --template '{rev}\n'
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   259
  7
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   260
  $ rm -fr n1 n2
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   261
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   262
pull in changes on foreign (merge of local branch) and local (2 new
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   263
heads) with a local change
7007
a6b74fbb5ce0 fetch: added support for named branches
Sune Foldager <cryo@cyanite.org>
parents: 6246
diff changeset
   264
12426
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   265
  $ hg clone nbase n1
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   266
  updating to branch default
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   267
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   268
  $ hg clone nbase n2
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   269
  updating to branch default
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   270
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   271
  $ hg -R n1 up -C a
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   272
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   273
  $ hg -R n1 merge b
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   274
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   275
  (branch merge, don't forget to commit)
15244
f6d5d01725db tests: cleanup of test-fetch.t
Mads Kiilerich <mads@kiilerich.com>
parents: 15243
diff changeset
   276
  $ hg -R n1 ci -m merge
12426
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   277
  $ hg -R n1 up -C 2
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   278
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   279
  $ echo c > n1/a
15244
f6d5d01725db tests: cleanup of test-fetch.t
Mads Kiilerich <mads@kiilerich.com>
parents: 15243
diff changeset
   280
  $ hg -R n1 ci -m c
12426
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   281
  $ hg -R n1 up -C 2
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   282
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   283
  $ echo cc > n1/a
15244
f6d5d01725db tests: cleanup of test-fetch.t
Mads Kiilerich <mads@kiilerich.com>
parents: 15243
diff changeset
   284
  $ hg -R n1 ci -m cc
12426
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   285
  created new head
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   286
  $ hg -R n2 up -C b
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   287
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   288
  $ echo change >> n2/b
15244
f6d5d01725db tests: cleanup of test-fetch.t
Mads Kiilerich <mads@kiilerich.com>
parents: 15243
diff changeset
   289
  $ hg -R n2 ci -A -m local
f6d5d01725db tests: cleanup of test-fetch.t
Mads Kiilerich <mads@kiilerich.com>
parents: 15243
diff changeset
   290
  $ hg -R n2 fetch -m 'merge' n1
12426
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   291
  pulling from n1
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   292
  searching for changes
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   293
  adding changesets
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   294
  adding manifests
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   295
  adding file changes
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   296
  added 3 changesets with 2 changes to 1 files (+2 heads)
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   297
  not merging with 1 other new branch heads (use "hg heads ." and "hg merge" to merge them)
12711
b885f28fa4fa fetch: fix and document exit codes (issue2356)
Matt Mackall <mpm@selenic.com>
parents: 12643
diff changeset
   298
  [1]
7049
6489ee64b522 fetch: use dirstate branch instead of first parents
Sune Foldager <cryo@cyanite.org>
parents: 7007
diff changeset
   299
12426
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   300
parent should be 3 (fetch did not merge anything)
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   301
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   302
  $ hg -R n2 parents --template '{rev}\n'
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   303
  3
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   304
  $ rm -fr n1 n2
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   305
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   306
pull in change on different branch than dirstate
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   307
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   308
  $ hg init n1
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   309
  $ echo a > n1/a
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   310
  $ hg -R n1 ci -Am initial
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   311
  adding a
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   312
  $ hg clone n1 n2
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   313
  updating to branch default
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   314
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   315
  $ echo b > n1/a
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   316
  $ hg -R n1 ci -m next
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   317
  $ hg -R n2 branch topic
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   318
  marked working directory as branch topic
15244
f6d5d01725db tests: cleanup of test-fetch.t
Mads Kiilerich <mads@kiilerich.com>
parents: 15243
diff changeset
   319
  $ hg -R n2 fetch -m merge n1
12426
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   320
  abort: working dir not at branch tip (use "hg update" to check out branch tip)
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   321
  [255]
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   322
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   323
parent should be 0 (fetch did not update or merge anything)
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   324
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   325
  $ hg -R n2 parents --template '{rev}\n'
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   326
  0
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   327
  $ rm -fr n1 n2
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   328
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   329
test fetch with inactive branches
7855
aa1a87f7544f regression test for issue1552
Benjamin Pollack <benjamin@bitquabit.com>
parents: 7344
diff changeset
   330
12426
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   331
  $ hg init ib1
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   332
  $ echo a > ib1/a
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   333
  $ hg --cwd ib1 ci -Am base
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   334
  adding a
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   335
  $ hg --cwd ib1 branch second
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   336
  marked working directory as branch second
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   337
  $ echo b > ib1/b
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   338
  $ hg --cwd ib1 ci -Am onsecond
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   339
  adding b
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   340
  $ hg --cwd ib1 branch -f default
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   341
  marked working directory as branch default
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   342
  $ echo c > ib1/c
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   343
  $ hg --cwd ib1 ci -Am newdefault
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   344
  adding c
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   345
  created new head
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   346
  $ hg clone ib1 ib2
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   347
  updating to branch default
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   348
  3 files updated, 0 files merged, 0 files removed, 0 files unresolved
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   349
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   350
fetch should succeed
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   351
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   352
  $ hg --cwd ib2 fetch ../ib1
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   353
  pulling from ../ib1
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   354
  searching for changes
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   355
  no changes found
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   356
  $ rm -fr ib1 ib2
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   357
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   358
test issue1726
9093
0b2b269ba3d0 branch heads: fix regression introduced in e67e5b60e55f (issue1726)
Henrik Stuart <hg@hstuart.dk>
parents: 7855
diff changeset
   359
12426
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   360
  $ hg init i1726r1
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   361
  $ echo a > i1726r1/a
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   362
  $ hg --cwd i1726r1 ci -Am base
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   363
  adding a
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   364
  $ hg clone i1726r1 i1726r2
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   365
  updating to branch default
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   366
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   367
  $ echo b > i1726r1/a
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   368
  $ hg --cwd i1726r1 ci -m second
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   369
  $ echo c > i1726r2/a
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   370
  $ hg --cwd i1726r2 ci -m third
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   371
  $ HGMERGE=true hg --cwd i1726r2 fetch ../i1726r1
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   372
  pulling from ../i1726r1
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   373
  searching for changes
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   374
  adding changesets
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   375
  adding manifests
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   376
  adding file changes
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   377
  added 1 changesets with 1 changes to 1 files (+1 heads)
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   378
  updating to 2:7837755a2789
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   379
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   380
  merging with 1:d1f0c6c48ebd
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   381
  merging a
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   382
  0 files updated, 1 files merged, 0 files removed, 0 files unresolved
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   383
  new changeset 3:* merges remote changes with local (glob)
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   384
  $ hg --cwd i1726r2 heads default --template '{rev}\n'
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   385
  3
10580
612c142b7a82 fetch: fix newheads calculation (issue2047)
Sune Foldager <cryo@cyanite.org>
parents: 10398
diff changeset
   386
12426
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   387
test issue2047
7344
58fd3c718ca4 tests: add killdaemons helper script
Matt Mackall <mpm@selenic.com>
parents: 7049
diff changeset
   388
12426
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   389
  $ hg -q init i2047a
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   390
  $ cd i2047a
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   391
  $ echo a > a
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   392
  $ hg -q ci -Am a
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   393
  $ hg -q branch stable
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   394
  $ echo b > b
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   395
  $ hg -q ci -Am b
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   396
  $ cd ..
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   397
  $ hg -q clone -r 0 i2047a i2047b
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   398
  $ cd i2047b
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   399
  $ hg fetch ../i2047a
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   400
  pulling from ../i2047a
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   401
  searching for changes
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   402
  adding changesets
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   403
  adding manifests
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   404
  adding file changes
dd600141616d tests: unify test-fetch
Matt Mackall <mpm@selenic.com>
parents: 10581
diff changeset
   405
  added 1 changesets with 1 changes to 1 files