Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/manifest-bug @ 326:235443668bea
mdiff: fix the fix
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
mdiff: fix the fix
I saw you check in the thing back in but with another typo.
You check in "la < lenb", should be "la < lena".
So we are even :-)
Chris
manifest hash: 57157502250b0120bcc12a75a530d4c133673b39
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCrg5tywK+sNU5EO8RAvLPAKCOs76LKPniKHFa15YwzWWsNZ5/xACfesl3
WCiUjdeYUtU3jVKCEwmjAT0=
=+GFy
-----END PGP SIGNATURE-----
author | mpm@selenic.com |
---|---|
date | Mon, 13 Jun 2005 14:53:33 -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 |