Show More
@@ -510,6 +510,7 b' class localrepository(repo.repository):' | |||
|
510 | 510 | m1 = self.manifest.read(c1[0]).copy() |
|
511 | 511 | m2 = self.manifest.read(c2[0]) |
|
512 | 512 | changed = [] |
|
513 | removed = [] | |
|
513 | 514 | |
|
514 | 515 | if orig_parent == p1: |
|
515 | 516 | update_dirstate = 1 |
@@ -530,13 +531,15 b' class localrepository(repo.repository):' | |||
|
530 | 531 | del m1[f] |
|
531 | 532 | if update_dirstate: |
|
532 | 533 | self.dirstate.forget([f]) |
|
534 | removed.append(f) | |
|
533 | 535 | except: |
|
534 | 536 | # deleted from p2? |
|
535 | 537 | pass |
|
536 | 538 | |
|
537 | 539 | mnode = self.manifest.add(m1, tr, linkrev, c1[0], c2[0]) |
|
538 | 540 | user = user or self.ui.username() |
|
539 |
n = self.changelog.add(mnode, changed, text, |
|
|
541 | n = self.changelog.add(mnode, changed + removed, text, | |
|
542 | tr, p1, p2, user, date) | |
|
540 | 543 | tr.close() |
|
541 | 544 | if update_dirstate: |
|
542 | 545 | self.dirstate.setparents(n, nullid) |
@@ -10,24 +10,24 b' hg manifest 1' | |||
|
10 | 10 | echo this is c1 > c |
|
11 | 11 | hg rawcommit -p 1 -d "1000000 0" -m2 c |
|
12 | 12 | hg manifest 2 |
|
13 | hg parents | |
|
13 | hg -v parents | |
|
14 | 14 | rm b |
|
15 | 15 | hg rawcommit -p 2 -d "1000000 0" -m3 b |
|
16 | 16 | hg manifest 3 |
|
17 | hg parents | |
|
17 | hg -v parents | |
|
18 | 18 | echo this is a22 > a |
|
19 | 19 | hg rawcommit -p 3 -d "1000000 0" -m4 a |
|
20 | 20 | hg manifest 4 |
|
21 | hg parents | |
|
21 | hg -v parents | |
|
22 | 22 | echo this is c22 > c |
|
23 | 23 | hg rawcommit -p 1 -d "1000000 0" -m5 c |
|
24 | 24 | hg manifest 5 |
|
25 | hg parents | |
|
25 | hg -v parents | |
|
26 | 26 | # merge, but no files changed |
|
27 | 27 | hg rawcommit -p 4 -p 5 -d "1000000 0" -m6 |
|
28 | 28 | hg manifest 6 |
|
29 | hg parents | |
|
29 | hg -v parents | |
|
30 | 30 | # no changes what-so-ever |
|
31 | 31 | hg rawcommit -p 6 -d "1000000 0" -m7 |
|
32 | 32 | hg manifest 7 |
|
33 | hg parents | |
|
33 | hg -v parents |
@@ -8,52 +8,70 b' changeset: 2:e110db3db549' | |||
|
8 | 8 | tag: tip |
|
9 | 9 | user: test |
|
10 | 10 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
11 | summary: 2 | |
|
11 | files: c | |
|
12 | description: | |
|
13 | 2 | |
|
14 | ||
|
12 | 15 | |
|
13 | 16 | (the rawcommit command is deprecated) |
|
14 | 17 | 05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644 a |
|
15 | 18 | 76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c |
|
16 |
changeset: 3: |
|
|
19 | changeset: 3:20652cf30cc0 | |
|
17 | 20 | tag: tip |
|
18 | 21 | user: test |
|
19 | 22 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
20 | summary: 3 | |
|
23 | files: b | |
|
24 | description: | |
|
25 | 3 | |
|
26 | ||
|
21 | 27 | |
|
22 | 28 | (the rawcommit command is deprecated) |
|
23 | 29 | d6e3c4976c13feb1728cd3ac851abaf7256a5c23 644 a |
|
24 | 30 | 76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c |
|
25 |
changeset: 4: |
|
|
31 | changeset: 4:42556b925639 | |
|
26 | 32 | tag: tip |
|
27 | 33 | user: test |
|
28 | 34 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
29 | summary: 4 | |
|
35 | files: a | |
|
36 | description: | |
|
37 | 4 | |
|
38 | ||
|
30 | 39 | |
|
31 | 40 | (the rawcommit command is deprecated) |
|
32 | 41 | 05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644 a |
|
33 | 42 | 54837d97f2932a8194e69745a280a2c11e61ff9c 644 b |
|
34 | 43 | 3570202ceac2b52517df64ebd0a062cb0d8fe33a 644 c |
|
35 |
changeset: 4: |
|
|
44 | changeset: 4:42556b925639 | |
|
36 | 45 | user: test |
|
37 | 46 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
38 | summary: 4 | |
|
47 | files: a | |
|
48 | description: | |
|
49 | 4 | |
|
50 | ||
|
39 | 51 | |
|
40 | 52 | (the rawcommit command is deprecated) |
|
41 | 53 | d6e3c4976c13feb1728cd3ac851abaf7256a5c23 644 a |
|
42 | 54 | 76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c |
|
43 |
changeset: 6: |
|
|
55 | changeset: 6:8a0c9254b0ab | |
|
44 | 56 | tag: tip |
|
45 |
parent: 4: |
|
|
57 | parent: 4:42556b925639 | |
|
46 | 58 | parent: 5:f56d4c64ab98 |
|
47 | 59 | user: test |
|
48 | 60 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
49 | summary: 6 | |
|
61 | files: | |
|
62 | description: | |
|
63 | 6 | |
|
64 | ||
|
50 | 65 | |
|
51 | 66 | (the rawcommit command is deprecated) |
|
52 | 67 | d6e3c4976c13feb1728cd3ac851abaf7256a5c23 644 a |
|
53 | 68 | 76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c |
|
54 |
changeset: 7: |
|
|
69 | changeset: 7:a5a6e1f312b9 | |
|
55 | 70 | tag: tip |
|
56 | 71 | user: test |
|
57 | 72 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
58 | summary: 7 | |
|
73 | files: | |
|
74 | description: | |
|
75 | 7 | |
|
59 | 76 | |
|
77 |
General Comments 0
You need to be logged in to leave comments.
Login now