Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-merge1 @ 407:0e0d0670b2bc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[PATCH] Merging identical changes from another branch -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] Merging identical changes from another branch From: Michael A Fetterman <Michael.Fetterman@cl.cam.ac.uk> The issue comes up when a local uncommitted *new* file (i.e. not in the current manifest) is being merged with an identical file from a branch. Since the file is not in the current manifest (it's either in the current "to-be-added" list, or in the "unknown" state), there's no (local) node from which to create a mergepoint. manifest hash: 4e64ce654a6473524789a97bbaf8bff61b4343af -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuM/1ywK+sNU5EO8RAn7xAKCJoH/CgzVK4h4xPJDrd2lY9XOINACgmt01 92uuMswZXcoCchQAaxew7C0= =qRsk -----END PGP SIGNATURE-----
author mpm@selenic.com
date Tue, 21 Jun 2005 18:41:57 -0800
parents
children 5b22029b5aa2
comparison
equal deleted inserted replaced
406:d8abb687d501 407:0e0d0670b2bc
1 #!/bin/sh -x
2
3 cat <<'EOF' > merge
4 #!/bin/sh
5 echo merging for `basename $1`
6 EOF
7 chmod +x merge
8
9 mkdir t
10 cd t
11 hg init
12 echo This is file a1 > a
13 hg add a
14 hg commit -t "commit #0" -d "0 0" -u user
15 echo This is file b1 > b
16 hg add b
17 hg commit -t "commit #1" -d "0 0" -u user
18
19 hg update 0
20 echo This is file c1 > c
21 hg add c
22 hg commit -t "commit #2" -d "0 0" -u user
23 echo This is file b1 > b
24 env HGMERGE=../merge hg update -m 1
25 # no merges expected
26 cd ..; /bin/rm -rf t
27
28 mkdir t
29 cd t
30 hg init
31 echo This is file a1 > a
32 hg add a
33 hg commit -t "commit #0" -d "0 0" -u user
34 echo This is file b1 > b
35 hg add b
36 hg commit -t "commit #1" -d "0 0" -u user
37
38 hg update 0
39 echo This is file c1 > c
40 hg add c
41 hg commit -t "commit #2" -d "0 0" -u user
42 echo This is file b2 > b
43 env HGMERGE=../merge hg update -m 1
44 # merge of b expected
45 cd ..; /bin/rm -rf t
46
47 mkdir t
48 cd t
49 hg init
50 echo This is file a1 > a
51 hg add a
52 hg commit -t "commit #0" -d "0 0" -u user
53 echo This is file b1 > b
54 hg add b
55 hg commit -t "commit #1" -d "0 0" -u user
56 echo This is file b22 > b
57 hg commit -t "commit #2" -d "0 0" -u user
58 hg update 1
59 echo This is file c1 > c
60 hg add c
61 hg commit -t "commit #3" -d "0 0" -u user
62 echo This is file b22 > b
63 env HGMERGE=../merge hg update -m 2
64 # no merges expected
65 cd ..; /bin/rm -rf t
66
67 mkdir t
68 cd t
69 hg init
70 echo This is file a1 > a
71 hg add a
72 hg commit -t "commit #0" -d "0 0" -u user
73 echo This is file b1 > b
74 hg add b
75 hg commit -t "commit #1" -d "0 0" -u user
76 echo This is file b22 > b
77 hg commit -t "commit #2" -d "0 0" -u user
78 hg update 1
79 echo This is file c1 > c
80 hg add c
81 hg commit -t "commit #3" -d "0 0" -u user
82 echo This is file b33 > b
83 env HGMERGE=../merge hg update -m 2
84 # merge of b expected
85 cd ..; /bin/rm -rf t