Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/manifest-bug @ 28:9f64ee817199

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add some tests to the repo
author mpm@selenic.com
date Wed, 04 May 2005 22:57:51 -0800
parents
children
comparison
equal deleted inserted replaced
27:febfb35d2a3e 28:9f64ee817199
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