Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/manifest-bug @ 282:97d83e7fbf2f
mpatch: properly NULL out return in lalloc
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
mpatch: properly NULL out return in lalloc
From: K Thananchayan <thananck@yahoo.com>
manifest hash: 69952cb34e184eff19e3abff7638eb3a446f4dca
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCp0B+ywK+sNU5EO8RAuGdAJ4iZOnxExpZuhTjO0fcOFE9mNn/IACgjXbw
7mVqfBJeLbxViBorImLE12k=
=A1Vj
-----END PGP SIGNATURE-----
author | mpm@selenic.com |
---|---|
date | Wed, 08 Jun 2005 11:01:18 -0800 |
parents | 9f64ee817199 |
children |
rev | line source |
---|---|
28 | 1 #!/bin/sh -x |
2 | |
3 set +e | |
4 | |
5 BASE=foo.base | |
6 BR1=foo.br1 | |
7 BR2=foo.br2 | |
8 BR2_1=foo.br2_1 | |
9 | |
10 mkdir $BASE | |
11 cd $BASE | |
12 hg init | |
13 echo test > file | |
14 hg add file | |
15 EDITOR="echo 'initial commit' > " hg commit | |
16 cd .. | |
17 | |
18 mkdir $BR1 | |
19 cd $BR1 | |
20 hg branch ../$BASE | |
21 hg checkout | |
22 echo test > file1 | |
23 hg addremove | |
24 EDITOR="echo side commit >" hg commit | |
25 cd .. | |
26 | |
27 mkdir $BR2 | |
28 cd $BR2 | |
29 hg branch ../$BASE | |
30 hg checkout | |
31 echo yet more >> file2 | |
32 hg addremove | |
33 EDITOR="echo second update >" hg commit | |
34 cd .. | |
35 | |
36 mkdir $BR2_1 | |
37 cd $BR2_1 | |
38 hg branch ../$BR2 | |
39 hg checkout | |
40 EDITOR="echo commit merge >" hg merge ../$BR1 | |
41 | |
42 hg checkout |