| hg-reviewers |
This is just a workaround similar to the previous one. It will make it
easier to follow later patches.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/copies.py (4 lines) | |||
| M | tests/test-graft.t (3 lines) | |||
| M | tests/test-rename-merge2.t (4 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz |
| if len(fl) == 2 and fl[0] == fl[1]: | if len(fl) == 2 and fl[0] == fl[1]: | ||||
| copy[fl[0]] = of # not actually divergent, just matching renames | copy[fl[0]] = of # not actually divergent, just matching renames | ||||
| # Sometimes we get invalid copies here (the "and not remotebase" in | # Sometimes we get invalid copies here (the "and not remotebase" in | ||||
| # _checkcopies() seems suspicious). Filter them out. | # _checkcopies() seems suspicious). Filter them out. | ||||
| for dst, src in fullcopy.copy().items(): | for dst, src in fullcopy.copy().items(): | ||||
| if src not in mb: | if src not in mb: | ||||
| del fullcopy[dst] | del fullcopy[dst] | ||||
| # Sometimes we forget to add entries from "copy" to "fullcopy", so fix | |||||
| # that up here | |||||
| for dst, src in copy.items(): | |||||
| fullcopy[dst] = src | |||||
| if fullcopy and repo.ui.debugflag: | if fullcopy and repo.ui.debugflag: | ||||
| repo.ui.debug(" all copies found (* = to merge, ! = divergent, " | repo.ui.debug(" all copies found (* = to merge, ! = divergent, " | ||||
| "% = renamed and deleted):\n") | "% = renamed and deleted):\n") | ||||
| for f in sorted(fullcopy): | for f in sorted(fullcopy): | ||||
| note = "" | note = "" | ||||
| if f in copy: | if f in copy: | ||||
| note += "*" | note += "*" | ||||
| if f in divergeset: | if f in divergeset: | ||||
| $ hg graft -q 13 --debug | $ hg graft -q 13 --debug | ||||
| scanning for duplicate grafts | scanning for duplicate grafts | ||||
| grafting 13:7a4785234d87 "2" | grafting 13:7a4785234d87 "2" | ||||
| searching for copies back to rev 12 | searching for copies back to rev 12 | ||||
| unmatched files in other (from topological common ancestor): | unmatched files in other (from topological common ancestor): | ||||
| g | g | ||||
| unmatched files new in both: | unmatched files new in both: | ||||
| b | b | ||||
| all copies found (* = to merge, ! = divergent, % = renamed and deleted): | |||||
| src: 'a' -> dst: 'b' * | |||||
| checking for directory renames | |||||
| resolving manifests | resolving manifests | ||||
| branchmerge: True, force: True, partial: False | branchmerge: True, force: True, partial: False | ||||
| ancestor: b592ea63bb0c, local: 7e61b508e709+, remote: 7a4785234d87 | ancestor: b592ea63bb0c, local: 7e61b508e709+, remote: 7a4785234d87 | ||||
| starting 4 threads for background file closing (?) | starting 4 threads for background file closing (?) | ||||
| committing files: | committing files: | ||||
| b | b | ||||
| warning: can't find ancestor for 'b' copied from 'a'! | warning: can't find ancestor for 'b' copied from 'a'! | ||||
| reusing manifest form p1 (listed files actually unchanged) | reusing manifest form p1 (listed files actually unchanged) | ||||
| $ tm "um a b" "um a b" " " "9 do merge with ancestor in a" | $ tm "um a b" "um a b" " " "9 do merge with ancestor in a" | ||||
| created new head | created new head | ||||
| -------------- | -------------- | ||||
| test L:um a b R:um a b W: - 9 do merge with ancestor in a | test L:um a b R:um a b W: - 9 do merge with ancestor in a | ||||
| -------------- | -------------- | ||||
| searching for copies back to rev 1 | searching for copies back to rev 1 | ||||
| unmatched files new in both: | unmatched files new in both: | ||||
| b | b | ||||
| all copies found (* = to merge, ! = divergent, % = renamed and deleted): | |||||
| src: 'a' -> dst: 'b' * | |||||
| checking for directory renames | |||||
| resolving manifests | resolving manifests | ||||
| branchmerge: True, force: False, partial: False | branchmerge: True, force: False, partial: False | ||||
| ancestor: 924404dff337, local: 62e7bf090eba+, remote: 49b6d8032493 | ancestor: 924404dff337, local: 62e7bf090eba+, remote: 49b6d8032493 | ||||
| preserving b for resolve of b | preserving b for resolve of b | ||||
| preserving rev for resolve of rev | preserving rev for resolve of rev | ||||
| starting 4 threads for background file closing (?) | starting 4 threads for background file closing (?) | ||||
| b: both renamed from a -> m (premerge) | b: both renamed from a -> m (premerge) | ||||
| picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) | picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) | ||||
| unmatched files in other: | unmatched files in other: | ||||
| 3/g | 3/g | ||||
| 4/g | 4/g | ||||
| 7/f | 7/f | ||||
| unmatched files new in both: | unmatched files new in both: | ||||
| 0/f | 0/f | ||||
| 1/g | 1/g | ||||
| all copies found (* = to merge, ! = divergent, % = renamed and deleted): | all copies found (* = to merge, ! = divergent, % = renamed and deleted): | ||||
| src: '1/f' -> dst: '1/g' * | |||||
| src: '3/f' -> dst: '3/g' * | src: '3/f' -> dst: '3/g' * | ||||
| src: '4/f' -> dst: '4/g' * | src: '4/f' -> dst: '4/g' * | ||||
| src: '5/f' -> dst: '5/g' * | src: '5/f' -> dst: '5/g' * | ||||
| src: '6/f' -> dst: '6/g' * | src: '6/f' -> dst: '6/g' * | ||||
| checking for directory renames | checking for directory renames | ||||
| $ hg mani | $ hg mani | ||||
| 0/f | 0/f | ||||
| 1/g | 1/g | ||||