annotate tests/test-merge4 @ 523:003df62ae39f

[PATCH] Force "hg clone" to always create a new directory -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] Force "hg clone" to always create a new directory From: Bryan O'Sullivan <bos@serpentine.com> I just screwed myself by typing "hg clone foo" without specifying a destination directory, and after I was done mopping up the mess, concluded that this is a dangerous mode of operation that has no practical value. I've thus modified the clone command so that it always creates a destination directory. If none is specified, the destination is taken as the basename of the source. hg clone foo -> error, because foo already exists hg clone http://www.selenic.com/hg -> new repo, named hg hg clone ../bar -> new repo, named bar manifest hash: f21ed8f805a60c1326d99220772e1574b0870d6c -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCwxsIywK+sNU5EO8RAgooAKC3IL6vKyADb9s2qqqi4GMw2Z7asACbBtE/ TvPgwGtIiB2GC+N+V7r1VpI= =uTcK -----END PGP SIGNATURE-----
author mpm@selenic.com
date Wed, 29 Jun 2005 14:04:56 -0800
parents 5e9e8b8d2629
children 7e4843b7efd2
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
416
5e9e8b8d2629 [PATCH] Removal of a file added by merging branches
mpm@selenic.com
parents:
diff changeset
1 #!/bin/sh -x
5e9e8b8d2629 [PATCH] Removal of a file added by merging branches
mpm@selenic.com
parents:
diff changeset
2
5e9e8b8d2629 [PATCH] Removal of a file added by merging branches
mpm@selenic.com
parents:
diff changeset
3 hg init
5e9e8b8d2629 [PATCH] Removal of a file added by merging branches
mpm@selenic.com
parents:
diff changeset
4 echo This is file a1 > a
5e9e8b8d2629 [PATCH] Removal of a file added by merging branches
mpm@selenic.com
parents:
diff changeset
5 hg add a
5e9e8b8d2629 [PATCH] Removal of a file added by merging branches
mpm@selenic.com
parents:
diff changeset
6 hg commit -t "commit #0" -d "0 0" -u user
5e9e8b8d2629 [PATCH] Removal of a file added by merging branches
mpm@selenic.com
parents:
diff changeset
7 echo This is file b1 > b
5e9e8b8d2629 [PATCH] Removal of a file added by merging branches
mpm@selenic.com
parents:
diff changeset
8 hg add b
5e9e8b8d2629 [PATCH] Removal of a file added by merging branches
mpm@selenic.com
parents:
diff changeset
9 hg commit -t "commit #1" -d "0 0" -u user
5e9e8b8d2629 [PATCH] Removal of a file added by merging branches
mpm@selenic.com
parents:
diff changeset
10 hg update 0
5e9e8b8d2629 [PATCH] Removal of a file added by merging branches
mpm@selenic.com
parents:
diff changeset
11 echo This is file c1 > c
5e9e8b8d2629 [PATCH] Removal of a file added by merging branches
mpm@selenic.com
parents:
diff changeset
12 hg add c
5e9e8b8d2629 [PATCH] Removal of a file added by merging branches
mpm@selenic.com
parents:
diff changeset
13 hg commit -t "commit #2" -d "0 0" -u user
5e9e8b8d2629 [PATCH] Removal of a file added by merging branches
mpm@selenic.com
parents:
diff changeset
14 hg update -m 1
5e9e8b8d2629 [PATCH] Removal of a file added by merging branches
mpm@selenic.com
parents:
diff changeset
15 rm b
5e9e8b8d2629 [PATCH] Removal of a file added by merging branches
mpm@selenic.com
parents:
diff changeset
16 echo This is file c22 > c
5e9e8b8d2629 [PATCH] Removal of a file added by merging branches
mpm@selenic.com
parents:
diff changeset
17 hg commit -t "commit #3" -d "0 0" -u user