Mercurial Mercurial > hg > mercurial-crew-with-dirclash / 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-clone-failure.out
author Thomas Arendsen Hein <thomas@intevation.de>
Wed, 10 Aug 2005 06:47:46 +0100
changeset 862 d70c1c31fd45
parent 814 0902ffece4b4
child 925 5a034646e472
permissions -rw-r--r--
Fix 3-way-merge of original parent, workdir and new parent. The dirstate has to match what is in the repository (what would be checked out with 'hg update -C'), because the resulting file may be identical to the new parent, or it may be completely different. Previously the dirstate wasn't updated, so if you changed the file to look like the original parent, it might be considered unmodified relative to the new parent.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
550
96ff7dae94f7 [PATCH] Tests for clone command
mpm@selenic.com
parents:
diff changeset 
     1
 
+ hg clone a b
642
5d6177b72fcc Update tests
Matt Mackall <mpm@selenic.com>
parents: 550
diff changeset 
     2
 
abort: repository a/.hg not found!
550
96ff7dae94f7 [PATCH] Tests for clone command
mpm@selenic.com
parents:
diff changeset 
     3
 
255
96ff7dae94f7 [PATCH] Tests for clone command
mpm@selenic.com
parents:
diff changeset 
     4
 
+ hg clone http://127.0.0.1:3121/a b
96ff7dae94f7 [PATCH] Tests for clone command
mpm@selenic.com
parents:
diff changeset 
     5
 
requesting all changes
775
122449dd89db Fix up test results
mpm@selenic.com
parents: 642
diff changeset 
     6
 
abort: error: Connection refused
550
96ff7dae94f7 [PATCH] Tests for clone command
mpm@selenic.com
parents:
diff changeset 
     7
 
255
96ff7dae94f7 [PATCH] Tests for clone command
mpm@selenic.com
parents:
diff changeset 
     8
 
+ hg clone a b
642
5d6177b72fcc Update tests
Matt Mackall <mpm@selenic.com>
parents: 550
diff changeset 
     9
 
abort: repository a/.hg not found!
550
96ff7dae94f7 [PATCH] Tests for clone command
mpm@selenic.com
parents:
diff changeset 
    10
 
255
96ff7dae94f7 [PATCH] Tests for clone command
mpm@selenic.com
parents:
diff changeset 
    11
 
+ hg init
96ff7dae94f7 [PATCH] Tests for clone command
mpm@selenic.com
parents:
diff changeset 
    12
 
+ hg clone . ../a
96ff7dae94f7 [PATCH] Tests for clone command
mpm@selenic.com
parents:
diff changeset 
    13
 
abort: destination '../a' already exists
96ff7dae94f7 [PATCH] Tests for clone command
mpm@selenic.com
parents:
diff changeset 
    14
 
1
96ff7dae94f7 [PATCH] Tests for clone command
mpm@selenic.com
parents:
diff changeset 
    15
 
+ hg clone a b
642
5d6177b72fcc Update tests
Matt Mackall <mpm@selenic.com>
parents: 550
diff changeset 
    16
 
abort: repository a/.hg not found!
550
96ff7dae94f7 [PATCH] Tests for clone command
mpm@selenic.com
parents:
diff changeset 
    17
 
255
96ff7dae94f7 [PATCH] Tests for clone command
mpm@selenic.com
parents:
diff changeset 
    18
 
+ hg init
96ff7dae94f7 [PATCH] Tests for clone command
mpm@selenic.com
parents:
diff changeset 
    19
 
+ hg clone q
96ff7dae94f7 [PATCH] Tests for clone command
mpm@selenic.com
parents:
diff changeset 
    20
 
abort: destination 'q' already exists
mercurial-crew-with-dirclash