Show More
@@ -0,0 +1,34 b'' | |||||
|
1 | #!/bin/sh | |||
|
2 | ||||
|
3 | echo % init foo-base | |||
|
4 | hg init foo-base | |||
|
5 | ||||
|
6 | echo % create alpha in first repo | |||
|
7 | cd foo-base | |||
|
8 | echo 'alpha' > alpha | |||
|
9 | hg ci -A -m 'add alpha' -d '1 0' | |||
|
10 | cd .. | |||
|
11 | ||||
|
12 | echo % clone foo-base to foo-work | |||
|
13 | hg clone foo-base foo-work | |||
|
14 | ||||
|
15 | echo % create beta in second repo | |||
|
16 | cd foo-work | |||
|
17 | echo 'beta' > beta | |||
|
18 | hg ci -A -m 'add beta' -d '2 0' | |||
|
19 | cd .. | |||
|
20 | ||||
|
21 | echo % create gamma in first repo | |||
|
22 | cd foo-base | |||
|
23 | echo 'gamma' > gamma | |||
|
24 | hg ci -A -m 'add gamma' -d '3 0' | |||
|
25 | cd .. | |||
|
26 | ||||
|
27 | echo % pull into work and merge | |||
|
28 | cd foo-work | |||
|
29 | hg pull | |||
|
30 | hg merge | |||
|
31 | ||||
|
32 | echo % revert to changeset 1 to simulate a failed merge | |||
|
33 | rm -fr * | |||
|
34 | hg up -C 1 |
@@ -0,0 +1,21 b'' | |||||
|
1 | % init foo-base | |||
|
2 | % create alpha in first repo | |||
|
3 | adding alpha | |||
|
4 | % clone foo-base to foo-work | |||
|
5 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||
|
6 | % create beta in second repo | |||
|
7 | adding beta | |||
|
8 | % create gamma in first repo | |||
|
9 | adding gamma | |||
|
10 | % pull into work and merge | |||
|
11 | pulling from /tmp/hgtests.H64eVH/test-manifest-merging/foo-base | |||
|
12 | searching for changes | |||
|
13 | adding changesets | |||
|
14 | adding manifests | |||
|
15 | adding file changes | |||
|
16 | added 1 changesets with 1 changes to 1 files (+1 heads) | |||
|
17 | (run 'hg heads' to see heads, 'hg merge' to merge) | |||
|
18 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||
|
19 | (branch merge, don't forget to commit) | |||
|
20 | % revert to changeset 1 to simulate a failed merge | |||
|
21 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
@@ -360,7 +360,8 b' class workingctx(changectx):' | |||||
360 | man.set(f, util.is_exec(self._repo.wjoin(f), man.execf(f))) |
|
360 | man.set(f, util.is_exec(self._repo.wjoin(f), man.execf(f))) | |
361 |
|
361 | |||
362 | for f in deleted + removed: |
|
362 | for f in deleted + removed: | |
363 |
|
|
363 | if f in man: | |
|
364 | del man[f] | |||
364 |
|
365 | |||
365 | self._manifest = man |
|
366 | self._manifest = man | |
366 |
|
367 |
General Comments 0
You need to be logged in to leave comments.
Login now