Mercurial > hg > gitweb

comparison tests/test-merge1.out @ 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 + cat
2 + chmod +x merge
3 + mkdir t
4 + cd t
5 + hg init
6 + echo This is file a1
7 + hg add a
8 + hg commit -t 'commit #0' -d '0 0' -u user
9 + echo This is file b1
10 + hg add b
11 + hg commit -t 'commit #1' -d '0 0' -u user
12 + hg update 0
13 + echo This is file c1
14 + hg add c
15 + hg commit -t 'commit #2' -d '0 0' -u user
16 + echo This is file b1
17 + env HGMERGE=../merge hg update -m 1
18 + cd ..
19 + /bin/rm -rf t
20 + mkdir t
21 + cd t
22 + hg init
23 + echo This is file a1
24 + hg add a
25 + hg commit -t 'commit #0' -d '0 0' -u user
26 + echo This is file b1
27 + hg add b
28 + hg commit -t 'commit #1' -d '0 0' -u user
29 + hg update 0
30 + echo This is file c1
31 + hg add c
32 + hg commit -t 'commit #2' -d '0 0' -u user
33 + echo This is file b2
34 + env HGMERGE=../merge hg update -m 1
35 merging for b
36 merging b
37 + cd ..
38 + /bin/rm -rf t
39 + mkdir t
40 + cd t
41 + hg init
42 + echo This is file a1
43 + hg add a
44 + hg commit -t 'commit #0' -d '0 0' -u user
45 + echo This is file b1
46 + hg add b
47 + hg commit -t 'commit #1' -d '0 0' -u user
48 + echo This is file b22
49 + hg commit -t 'commit #2' -d '0 0' -u user
50 + hg update 1
51 + echo This is file c1
52 + hg add c
53 + hg commit -t 'commit #3' -d '0 0' -u user
54 + echo This is file b22
55 + env HGMERGE=../merge hg update -m 2
56 + cd ..
57 + /bin/rm -rf t
58 + mkdir t
59 + cd t
60 + hg init
61 + echo This is file a1
62 + hg add a
63 + hg commit -t 'commit #0' -d '0 0' -u user
64 + echo This is file b1
65 + hg add b
66 + hg commit -t 'commit #1' -d '0 0' -u user
67 + echo This is file b22
68 + hg commit -t 'commit #2' -d '0 0' -u user
69 + hg update 1
70 + echo This is file c1
71 + hg add c
72 + hg commit -t 'commit #3' -d '0 0' -u user
73 + echo This is file b33
74 + env HGMERGE=../merge hg update -m 2
75 merging for b
76 merging b
77 + cd ..
78 + /bin/rm -rf t