Show More
@@ -882,16 +882,15 b' class localrepository(repo.repository):' | |||||
882 |
|
882 | |||
883 | # update manifest |
|
883 | # update manifest | |
884 | m1.update(new) |
|
884 | m1.update(new) | |
885 | removed = [] |
|
885 | removed = [f for f in util.sort(remove) if f in m1 or f in m2] | |
|
886 | removed1 = [] | |||
886 |
|
887 | |||
887 |
for f in |
|
888 | for f in removed: | |
888 | if f in m1: |
|
889 | if f in m1: | |
889 | del m1[f] |
|
890 | del m1[f] | |
890 | removed.append(f) |
|
891 | removed1.append(f) | |
891 | elif f in m2: |
|
|||
892 | removed.append(f) |
|
|||
893 | mn = self.manifest.add(m1, trp, linkrev, c1[0], c2[0], |
|
892 | mn = self.manifest.add(m1, trp, linkrev, c1[0], c2[0], | |
894 | (new, removed)) |
|
893 | (new, removed1)) | |
895 |
|
894 | |||
896 | # add changeset |
|
895 | # add changeset | |
897 | if (not empty_ok and not text) or force_editor: |
|
896 | if (not empty_ok and not text) or force_editor: |
@@ -17,3 +17,33 b' hg rm -f a' | |||||
17 | hg ci -Amc |
|
17 | hg ci -Amc | |
18 |
|
18 | |||
19 | hg st -A |
|
19 | hg st -A | |
|
20 | cd .. | |||
|
21 | ||||
|
22 | # a test for issue 1433, related to issue586 | |||
|
23 | echo % create test repos | |||
|
24 | hg init repoa | |||
|
25 | touch repoa/a | |||
|
26 | hg -R repoa ci -Am adda | |||
|
27 | ||||
|
28 | hg init repob | |||
|
29 | touch repob/b | |||
|
30 | hg -R repob ci -Am addb | |||
|
31 | ||||
|
32 | hg init repoc | |||
|
33 | cd repoc | |||
|
34 | hg pull ../repoa | |||
|
35 | hg update | |||
|
36 | mkdir tst | |||
|
37 | hg mv * tst | |||
|
38 | hg ci -m "import a in tst" | |||
|
39 | hg pull -f ../repob | |||
|
40 | echo % merge both repos | |||
|
41 | hg merge | |||
|
42 | mkdir src | |||
|
43 | echo % move b content | |||
|
44 | hg mv b src | |||
|
45 | hg ci -m "import b in src" | |||
|
46 | hg manifest | |||
|
47 | ||||
|
48 | ||||
|
49 |
@@ -11,3 +11,28 b' added 1 changesets with 1 changes to 1 f' | |||||
11 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
11 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
12 | (branch merge, don't forget to commit) |
|
12 | (branch merge, don't forget to commit) | |
13 | C b |
|
13 | C b | |
|
14 | % create test repos | |||
|
15 | adding a | |||
|
16 | adding b | |||
|
17 | pulling from ../repoa | |||
|
18 | requesting all changes | |||
|
19 | adding changesets | |||
|
20 | adding manifests | |||
|
21 | adding file changes | |||
|
22 | added 1 changesets with 1 changes to 1 files | |||
|
23 | (run 'hg update' to get a working copy) | |||
|
24 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||
|
25 | pulling from ../repob | |||
|
26 | searching for changes | |||
|
27 | warning: repository is unrelated | |||
|
28 | adding changesets | |||
|
29 | adding manifests | |||
|
30 | adding file changes | |||
|
31 | added 1 changesets with 1 changes to 1 files (+1 heads) | |||
|
32 | (run 'hg heads' to see heads, 'hg merge' to merge) | |||
|
33 | % merge both repos | |||
|
34 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||
|
35 | (branch merge, don't forget to commit) | |||
|
36 | % move b content | |||
|
37 | src/b | |||
|
38 | tst/a |
General Comments 0
You need to be logged in to leave comments.
Login now