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-bad-pull.out
author mpm@selenic.com
Tue, 21 Jun 2005 19:19:39 -0800
changeset 416 5e9e8b8d2629
parent 395 fbe8834923c5
child 503 c6a2e41c8c60
permissions -rw-r--r--
[PATCH] Removal of a file added by merging branches -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] Removal of a file added by merging branches From: Michael A Fetterman <Michael.Fetterman@cl.cam.ac.uk> Fixing a bug where removal of a file which is added when doing a merge would cause python exception to be thrown. manifest hash: 0bdd80e8abcee6aaa4804bb588f9939596fb3dd0 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuNjLywK+sNU5EO8RAo44AJ4mvjsJcYOj/EmVDFrdkK3D3WHFSwCffxfV cRl8mXc252/oRcYaMZbgrlg= =S5x6 -----END PGP SIGNATURE-----
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
395
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset 
     1
 
requesting all changes
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset 
     2
 
adding changesets
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset 
     3
 
abort: error 111: Connection refused
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset 
     4
 
transaction abort!
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset 
     5
 
rollback completed
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset 
     6
 
checking changesets
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset 
     7
 
checking manifests
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset 
     8
 
crosschecking files in changesets and manifests
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset 
     9
 
checking files
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset 
    10
 
0 files, 0 changesets, 0 total revisions
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset 
    11
 
cat: foo: No such file or directory
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset 
    12
 
requesting all changes
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset 
    13
 
adding changesets
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset 
    14
 
abort: HTTP Error 404: File not found
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset 
    15
 
transaction abort!
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset 
    16
 
rollback completed
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset 
    17
 
checking changesets
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset 
    18
 
checking manifests
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset 
    19
 
crosschecking files in changesets and manifests
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset 
    20
 
checking files
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset 
    21
 
0 files, 0 changesets, 0 total revisions
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset 
    22
 
cat: foo: No such file or directory
mercurial-crew-with-dirclash