Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/manifest-bug @ 348:442eb02cf870
Improved hgeditor:
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Improved hgeditor:
hgeditor now uses $EDITOR and sets options according to emacs/vim/...
Cleanup of temporary files.
Use simple 'hg diff' instead of calling it for every file.
Call gpg only if commit message was changed.
manifest hash: 5c56bf580f9c2ef2a7d8b680bfb73fdd3b232044
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
iD8DBQFCrowgW7P1GVgWeRoRApiOAJ0UI9/OY3yr4bv0no+KCcponSq+ZwCdFDUU
No8t9ni6/72zmlcpB13E63A=
=oSyb
-----END PGP SIGNATURE-----
| author | Thomas Arendsen Hein <thomas@intevation.de> |
|---|---|
| date | Tue, 14 Jun 2005 08:49:52 +0100 |
| 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 |