| author | David Soria Parra <dsp@php.net> |
| Sun, 07 Dec 2008 08:47:02 +0100 | |
| changeset 7485 | ecfb683675ed |
| parent 3619 | 8c4fd0de5de8 |
| child 12156 | 4c94b6d0fb1c |
| permissions | -rw-r--r-- |
|
579
ffeb2c3a1966
Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff
changeset
|
1 |
pulling from ../a |
|
ffeb2c3a1966
Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff
changeset
|
2 |
searching for changes |
|
1960
dac4bd67f6c5
update test for unrelated repo.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1933
diff
changeset
|
3 |
abort: repository is unrelated |
|
dac4bd67f6c5
update test for unrelated repo.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1933
diff
changeset
|
4 |
pulling from ../a |
|
dac4bd67f6c5
update test for unrelated repo.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1933
diff
changeset
|
5 |
searching for changes |
|
dac4bd67f6c5
update test for unrelated repo.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1933
diff
changeset
|
6 |
warning: repository is unrelated |
|
579
ffeb2c3a1966
Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff
changeset
|
7 |
adding changesets |
|
ffeb2c3a1966
Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff
changeset
|
8 |
adding manifests |
| 775 | 9 |
adding file changes |
| 1043 | 10 |
added 1 changesets with 1 changes to 1 files (+1 heads) |
|
2019
ced2d3620f95
add merge command. means same thing as "update -m".
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1960
diff
changeset
|
11 |
(run 'hg heads' to see heads, 'hg merge' to merge) |
|
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1043
diff
changeset
|
12 |
changeset: 1:bdcee5d51fa6 |
|
579
ffeb2c3a1966
Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff
changeset
|
13 |
tag: tip |
|
3619
8c4fd0de5de8
Fix up parent display in logging
Matt Mackall <mpm@selenic.com>
parents:
2019
diff
changeset
|
14 |
parent: -1:000000000000 |
|
579
ffeb2c3a1966
Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff
changeset
|
15 |
user: a |
|
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1043
diff
changeset
|
16 |
date: Mon Jan 12 13:46:40 1970 +0000 |
|
579
ffeb2c3a1966
Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff
changeset
|
17 |
summary: a |
|
ffeb2c3a1966
Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff
changeset
|
18 |
|
|
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1043
diff
changeset
|
19 |
changeset: 0:f155ba1aa5ba |
|
579
ffeb2c3a1966
Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff
changeset
|
20 |
user: b |
|
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1043
diff
changeset
|
21 |
date: Mon Jan 12 13:46:40 1970 +0000 |
|
579
ffeb2c3a1966
Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff
changeset
|
22 |
summary: b |
|
ffeb2c3a1966
Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff
changeset
|
23 |