view tests/test-merge5.out @ 496:6ce95a04999d

[PATCH] simplify init

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

[PATCH] simplify init

From: Bryan O'Sullivan <[e-mail]>

Remove source directory option from "hg init".

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

iD8DBQFCwQG/ywK+sNU5EO8RArbCAJ9DG45GepMI0Z9KWXqV8gmEbV1WfwCgotih
LGAkD8iTfOLn7HIPVqt9FWY=
=65uW
-----END PGP SIGNATURE-----

+ mkdir t
+ cd t
+ hg init
+ echo This is file a1
+ echo This is file b1
+ hg add a b
+ hg commit -t 'commit #0' -d '0 0' -u user
+ echo This is file b22
+ hg commit '-tcomment #1' -d '0 0' -u user
+ hg update 0
+ rm b
+ hg commit -A '-tcomment #2' -d '0 0' -u user
+ yes k
+ hg update 1
this update spans a branch affecting the following files:
aborting update spanning branches!
(use update -m to perform a branch merge)
+ exit 0