view tests/test-conflict.out @ 405:99470ae6b424

Check if repository exists

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Check if repository exists

From: Goffredo Baroncelli <[e-mail]>
Subject: Re: Trivial: in remoterepository.__init__ check if the repository
        exist

I hope that this is correct :-)

Another typo, another patch, tank to Peter Stamfest and Radoslaw Szkodzinski.

The patch is trivial: adds a check in the body of the init method of the
+remoterepository
class. Before if the path didn't exist, hg would not raise any error.

Test manually performed after the patch has been merged:

test:                                                     result
create a new repository from another local repository     OK ( no problem )
create an empty repository                                OK ( no problem )
pull from a not existent repositary                       OK ( raise an error )

(error message tweaked by mpm)

manifest hash: ac7f625a8d87c693b61718b9fc5604d28b882bbd
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)

iD8DBQFCuM0gywK+sNU5EO8RAsnGAJ42HE3m01tlGqrIR3GVfuhvCjEJkgCfffvp
bEhfvjaiAdBV50HMULq8N00=
=QDHW
-----END PGP SIGNATURE-----

+ hg init
+ echo nothing
+ hg add a
+ hg commit -t ancestor -u test -d '0 0'
+ echo something
+ hg commit -t branch1 -u test -d '0 0'
+ hg co 0
+ echo 'something else'
+ hg commit -t branch2 -u test -d '0 0'
+ export HGMERGE=merge
+ HGMERGE=merge
+ hg -d up -m 1
merge: warning: conflicts during merge
resolving manifests
 ancestor 1c6e5a129854 local 35fedfab3325 remote a58017859bdc
 a versions differ, resolve
working dir created .out, keeping
merging a
resolving a
file a: other d7250518cb1b ancestor 68ba9db7a9e4
merging a failed!
+ hg id
32e80765d7fe+75234512624c+ tip
+ grep -Ev '>>>|<<<' a
something else
=======
something
+ hg status
C a
? .out