Mercurial Mercurial > mercurial / 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-unrelated-pull.out
author mpm@selenic.com
Sat, 30 Jul 2005 09:00:14 -0800
changeset 814 0902ffece4b4
parent 808 8f5637f0a0c0
parent 784 853bfbf1a312
child 925 5a034646e472
permissions -rw-r--r--
Merge with BOS
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
801
1f9ec150a476 Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 793
diff changeset 
     1
 
+ hg init
1f9ec150a476 Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 793
diff changeset 
     2
 
+ hg add a
1f9ec150a476 Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 793
diff changeset 
     3
 
+ hg commit -m a -u a -d 0 0
1f9ec150a476 Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 793
diff changeset 
     4
 
+ hg init
1f9ec150a476 Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 793
diff changeset 
     5
 
+ hg add b
1f9ec150a476 Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 793
diff changeset 
     6
 
+ hg commit -m b -u b -d 0 0
1f9ec150a476 Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 793
diff changeset 
     7
 
+ hg pull ../a
579
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff changeset 
     8
 
pulling from ../a
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff changeset 
     9
 
searching for changes
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff changeset 
    10
 
warning: pulling from an unrelated repository!
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff changeset 
    11
 
adding changesets
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff changeset 
    12
 
adding manifests
775
122449dd89db Fix up test results
mpm@selenic.com
parents: 579
diff changeset 
    13
 
adding file changes
122449dd89db Fix up test results
mpm@selenic.com
parents: 579
diff changeset 
    14
 
added 1 changesets with 1 changes to 1 files
579
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff changeset 
    15
 
(run 'hg update' to get a working copy)
801
1f9ec150a476 Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 793
diff changeset 
    16
 
+ hg heads
784
853bfbf1a312 Fix tests for short changeset hashes and hidden manifest hashes
mpm@selenic.com
parents: 775
diff changeset 
    17
 
changeset:   1:9a79c33a9db3
579
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff changeset 
    18
 
tag:         tip
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff changeset 
    19
 
user:        a
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff changeset 
    20
 
date:        Thu Jan  1 00:00:00 1970
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff changeset 
    21
 
summary:     a
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff changeset 
    22
 







784






853bfbf1a312
Fix tests for short changeset hashes and hidden manifest hashes



mpm@selenic.com


parents: 
775

diff
changeset




    23


changeset:   0:01f8062b2de5







579






ffeb2c3a1966
Actually warn on pulling from an unrelated repository



mpm@selenic.com


parents: 

diff
changeset




    24


user:        b












ffeb2c3a1966
Actually warn on pulling from an unrelated repository



mpm@selenic.com


parents: 

diff
changeset




    25


date:        Thu Jan  1 00:00:00 1970












ffeb2c3a1966
Actually warn on pulling from an unrelated repository



mpm@selenic.com


parents: 

diff
changeset




    26


summary:     b












ffeb2c3a1966
Actually warn on pulling from an unrelated repository



mpm@selenic.com


parents: 

diff
changeset




    27
















mercurial