This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6249

copies: delete debug message about search limit
ClosedPublic

Authored by martinvonz on Apr 16 2019, 1:16 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG91a0bc50b288: copies: delete debug message about search limit
rHG380f59da7aea: copies: delete debug message about search limit
Summary

I'm about to rewrite mergecopies() and this message will no longer be
emitted then. Let's remove the message now to remove a distraction
from that patch.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Revision Contents
Changeset List

Diff 14833

mercurial/copies.py

dirtyc1 = not base.isancestorof(_c1) dirtyc1 = not base.isancestorof(_c1)
dirtyc2 = not base.isancestorof(_c2) dirtyc2 = not base.isancestorof(_c2)
graft = dirtyc1 or dirtyc2 graft = dirtyc1 or dirtyc2
tca = base tca = base
if graft: if graft:
tca = _c1.ancestor(_c2) tca = _c1.ancestor(_c2)
limit = _findlimit(repo, c1, c2) limit = _findlimit(repo, c1, c2)
repo.ui.debug(" searching for copies back to rev %d\n" % limit)
m1 = c1.manifest() m1 = c1.manifest()
m2 = c2.manifest() m2 = c2.manifest()
mb = base.manifest() mb = base.manifest()
# gather data from _checkcopies: # gather data from _checkcopies:
# - diverge = record all diverges in this dict # - diverge = record all diverges in this dict
# - copy = record all non-divergent copies in this dict # - copy = record all non-divergent copies in this dict

tests/test-copy-move-merge.t

1 files updated, 0 files merged, 2 files removed, 0 files unresolved 1 files updated, 0 files merged, 2 files removed, 0 files unresolved
$ echo 0 > a $ echo 0 > a
$ echo 1 >> a $ echo 1 >> a
$ hg ci -qAm "other" $ hg ci -qAm "other"
$ hg merge --debug $ hg merge --debug
searching for copies back to rev 1
unmatched files in other: unmatched files in other:
b b
c c
all copies found (* = to merge, ! = divergent, % = renamed and deleted): all copies found (* = to merge, ! = divergent, % = renamed and deleted):
src: 'a' -> dst: 'b' * src: 'a' -> dst: 'b' *
src: 'a' -> dst: 'c' * src: 'a' -> dst: 'c' *
checking for directory renames checking for directory renames
resolving manifests resolving manifests

tests/test-double-merge.t

we get conflicts that shouldn't be there we get conflicts that shouldn't be there
$ hg merge -P $ hg merge -P
changeset: 1:484bf6903104 changeset: 1:484bf6903104
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: cp foo bar; change both summary: cp foo bar; change both
$ hg merge --debug $ hg merge --debug
searching for copies back to rev 1
unmatched files in other: unmatched files in other:
bar bar
all copies found (* = to merge, ! = divergent, % = renamed and deleted): all copies found (* = to merge, ! = divergent, % = renamed and deleted):
src: 'foo' -> dst: 'bar' * src: 'foo' -> dst: 'bar' *
checking for directory renames checking for directory renames
resolving manifests resolving manifests
branchmerge: True, force: False, partial: False branchmerge: True, force: False, partial: False
ancestor: e6dc8efe11cc, local: 6a0df1dad128+, remote: 484bf6903104 ancestor: e6dc8efe11cc, local: 6a0df1dad128+, remote: 484bf6903104

tests/test-graft.t

grafting 4:9c233e8e184d "4" grafting 4:9c233e8e184d "4"
grafting 3:4c60f11aa304 "3" grafting 3:4c60f11aa304 "3"
$ HGEDITOR=cat hg graft 1 5 'merge()' 2 --debug $ HGEDITOR=cat hg graft 1 5 'merge()' 2 --debug
skipping ungraftable merge revision 6 skipping ungraftable merge revision 6
scanning for duplicate grafts scanning for duplicate grafts
skipping revision 2:5c095ad7e90f (already grafted to 7:ef0ef43d49e7) skipping revision 2:5c095ad7e90f (already grafted to 7:ef0ef43d49e7)
grafting 1:5d205f8b35b6 "1" grafting 1:5d205f8b35b6 "1"
searching for copies back to rev 1
unmatched files in local: unmatched files in local:
b b
all copies found (* = to merge, ! = divergent, % = renamed and deleted): all copies found (* = to merge, ! = divergent, % = renamed and deleted):
src: 'a' -> dst: 'b' * src: 'a' -> dst: 'b' *
checking for directory renames checking for directory renames
resolving manifests resolving manifests
branchmerge: True, force: True, partial: False branchmerge: True, force: True, partial: False
ancestor: 68795b066622, local: ef0ef43d49e7+, remote: 5d205f8b35b6 ancestor: 68795b066622, local: ef0ef43d49e7+, remote: 5d205f8b35b6
preserving b for resolve of b preserving b for resolve of b
starting 4 threads for background file closing (?) starting 4 threads for background file closing (?)
b: local copied/moved from a -> m (premerge) b: local copied/moved from a -> m (premerge)
picked tool ':merge' for b (binary False symlink False changedelete False) picked tool ':merge' for b (binary False symlink False changedelete False)
merging b and a to b merging b and a to b
my b@ef0ef43d49e7+ other a@5d205f8b35b6 ancestor a@68795b066622 my b@ef0ef43d49e7+ other a@5d205f8b35b6 ancestor a@68795b066622
premerge successful premerge successful
committing files: committing files:
b b
committing manifest committing manifest
committing changelog committing changelog
updating the branch cache updating the branch cache
grafting 5:97f8bfe72746 "5" grafting 5:97f8bfe72746 "5"
searching for copies back to rev 1
unmatched files in other (from topological common ancestor): unmatched files in other (from topological common ancestor):
c c
resolving manifests resolving manifests
branchmerge: True, force: True, partial: False branchmerge: True, force: True, partial: False
ancestor: 4c60f11aa304, local: 6b9e5368ca4e+, remote: 97f8bfe72746 ancestor: 4c60f11aa304, local: 6b9e5368ca4e+, remote: 97f8bfe72746
e: remote is newer -> g e: remote is newer -> g
getting e getting e
committing files: committing files:
e e
committing manifest committing manifest
committing changelog committing changelog
updating the branch cache updating the branch cache
$ HGEDITOR=cat hg graft 4 3 --log --debug $ HGEDITOR=cat hg graft 4 3 --log --debug
scanning for duplicate grafts scanning for duplicate grafts
grafting 4:9c233e8e184d "4" grafting 4:9c233e8e184d "4"
searching for copies back to rev 1
unmatched files in other (from topological common ancestor): unmatched files in other (from topological common ancestor):
c c
resolving manifests resolving manifests
branchmerge: True, force: True, partial: False branchmerge: True, force: True, partial: False
ancestor: 4c60f11aa304, local: 1905859650ec+, remote: 9c233e8e184d ancestor: 4c60f11aa304, local: 1905859650ec+, remote: 9c233e8e184d
preserving e for resolve of e preserving e for resolve of e
d: remote is newer -> g d: remote is newer -> g
getting d getting d
user: foo user: foo
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: 2 summary: 2
... grafts of grafts unfortunately can't ... grafts of grafts unfortunately can't
$ 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
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): all copies found (* = to merge, ! = divergent, % = renamed and deleted):
src: 'a' -> dst: 'b' * src: 'a' -> dst: 'b' *
checking for directory renames checking for directory renames
resolving manifests resolving manifests

tests/test-issue1802.t

(run 'hg heads' to see heads, 'hg merge' to merge) (run 'hg heads' to see heads, 'hg merge' to merge)
$ hg manifest -v -r tip $ hg manifest -v -r tip
755 * a 755 * a
Simulate a Windows merge: Simulate a Windows merge:
$ hg --config extensions.n=$TESTTMP/noexec.py merge --debug $ hg --config extensions.n=$TESTTMP/noexec.py merge --debug
searching for copies back to rev 1
unmatched files in local: unmatched files in local:
b b
resolving manifests resolving manifests
branchmerge: True, force: False, partial: False branchmerge: True, force: False, partial: False
ancestor: a03b0deabf2b, local: d6fa54f68ae1+, remote: 2d8bcf2dda39 ancestor: a03b0deabf2b, local: d6fa54f68ae1+, remote: 2d8bcf2dda39
a: update permissions -> e a: update permissions -> e
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)

tests/test-issue522.t

$ hg up -C 0 $ hg up -C 0
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ touch bar $ touch bar
$ hg ci -qAm 'add bar' $ hg ci -qAm 'add bar'
$ hg merge --debug $ hg merge --debug
searching for copies back to rev 1
unmatched files in local: unmatched files in local:
bar bar
resolving manifests resolving manifests
branchmerge: True, force: False, partial: False branchmerge: True, force: False, partial: False
ancestor: bbd179dfa0a7, local: 71766447bdbb+, remote: 4d9e78aaceee ancestor: bbd179dfa0a7, local: 71766447bdbb+, remote: 4d9e78aaceee
foo: remote is newer -> g foo: remote is newer -> g
getting foo getting foo
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved

tests/test-issue672.t

$ hg co -C 0 $ hg co -C 0
1 files updated, 0 files merged, 1 files removed, 0 files unresolved 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ echo unrelated >> 2 $ echo unrelated >> 2
$ hg ci -m unrelated1 # 2 $ hg ci -m unrelated1 # 2
created new head created new head
$ hg merge --debug 1 $ hg merge --debug 1
searching for copies back to rev 1
unmatched files in other: unmatched files in other:
1a 1a
all copies found (* = to merge, ! = divergent, % = renamed and deleted): all copies found (* = to merge, ! = divergent, % = renamed and deleted):
src: '1' -> dst: '1a' src: '1' -> dst: '1a'
checking for directory renames checking for directory renames
resolving manifests resolving manifests
branchmerge: True, force: False, partial: False branchmerge: True, force: False, partial: False
ancestor: 81f4b099af3d, local: c64f439569a9+, remote: c12dcd37c90a ancestor: 81f4b099af3d, local: c64f439569a9+, remote: c12dcd37c90a
$ echo hello >> 1 $ echo hello >> 1
$ hg ci -m unrelated2 # 4 $ hg ci -m unrelated2 # 4
created new head created new head
$ hg co -C 3 $ hg co -C 3
1 files updated, 0 files merged, 1 files removed, 0 files unresolved 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg merge -y --debug 4 $ hg merge -y --debug 4
searching for copies back to rev 1
unmatched files in local: unmatched files in local:
1a 1a
all copies found (* = to merge, ! = divergent, % = renamed and deleted): all copies found (* = to merge, ! = divergent, % = renamed and deleted):
src: '1' -> dst: '1a' * src: '1' -> dst: '1a' *
checking for directory renames checking for directory renames
resolving manifests resolving manifests
branchmerge: True, force: False, partial: False branchmerge: True, force: False, partial: False
ancestor: c64f439569a9, local: e327dca35ac8+, remote: 746e9549ea96 ancestor: c64f439569a9, local: e327dca35ac8+, remote: 746e9549ea96
preserving 1a for resolve of 1a preserving 1a for resolve of 1a
starting 4 threads for background file closing (?)
1a: local copied/moved from 1 -> m (premerge) 1a: local copied/moved from 1 -> m (premerge)
starting 4 threads for background file closing (?)
picked tool ':merge' for 1a (binary False symlink False changedelete False) picked tool ':merge' for 1a (binary False symlink False changedelete False)
merging 1a and 1 to 1a merging 1a and 1 to 1a
my 1a@e327dca35ac8+ other 1@746e9549ea96 ancestor 1@c64f439569a9 my 1a@e327dca35ac8+ other 1@746e9549ea96 ancestor 1@c64f439569a9
premerge successful premerge successful
0 files updated, 1 files merged, 0 files removed, 0 files unresolved 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
$ hg co -C 4 $ hg co -C 4
1 files updated, 0 files merged, 1 files removed, 0 files unresolved 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg merge -y --debug 3 $ hg merge -y --debug 3
searching for copies back to rev 1
unmatched files in other: unmatched files in other:
1a 1a
all copies found (* = to merge, ! = divergent, % = renamed and deleted): all copies found (* = to merge, ! = divergent, % = renamed and deleted):
src: '1' -> dst: '1a' * src: '1' -> dst: '1a' *
checking for directory renames checking for directory renames
resolving manifests resolving manifests
branchmerge: True, force: False, partial: False branchmerge: True, force: False, partial: False
ancestor: c64f439569a9, local: 746e9549ea96+, remote: e327dca35ac8 ancestor: c64f439569a9, local: 746e9549ea96+, remote: e327dca35ac8
preserving 1 for resolve of 1a preserving 1 for resolve of 1a
removing 1 removing 1
starting 4 threads for background file closing (?)
1a: remote moved from 1 -> m (premerge) 1a: remote moved from 1 -> m (premerge)
starting 4 threads for background file closing (?)
picked tool ':merge' for 1a (binary False symlink False changedelete False) picked tool ':merge' for 1a (binary False symlink False changedelete False)
merging 1 and 1a to 1a merging 1 and 1a to 1a
my 1a@746e9549ea96+ other 1a@e327dca35ac8 ancestor 1@c64f439569a9 my 1a@746e9549ea96+ other 1a@e327dca35ac8 ancestor 1@c64f439569a9
premerge successful premerge successful
0 files updated, 1 files merged, 0 files removed, 0 files unresolved 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)

tests/test-merge-commit.t

3:0555950ead28 2:0f2ff26688b9 1:5cd961e4045d 3:0555950ead28 2:0f2ff26688b9 1:5cd961e4045d
2:0f2ff26688b9 0:2665aaee66e9 2:0f2ff26688b9 0:2665aaee66e9
1:5cd961e4045d 1:5cd961e4045d
0:2665aaee66e9 0:2665aaee66e9
This should use bar@rev2 as the ancestor: This should use bar@rev2 as the ancestor:
$ hg --debug merge 3 $ hg --debug merge 3
searching for copies back to rev 1
resolving manifests resolving manifests
branchmerge: True, force: False, partial: False branchmerge: True, force: False, partial: False
ancestor: 0f2ff26688b9, local: 2263c1be0967+, remote: 0555950ead28 ancestor: 0f2ff26688b9, local: 2263c1be0967+, remote: 0555950ead28
preserving bar for resolve of bar preserving bar for resolve of bar
starting 4 threads for background file closing (?) starting 4 threads for background file closing (?)
bar: versions differ -> m (premerge) bar: versions differ -> m (premerge)
picked tool ':merge' for bar (binary False symlink False changedelete False) picked tool ':merge' for bar (binary False symlink False changedelete False)
merging bar merging bar
3:3ffa6b9e35f0 1:5cd961e4045d 2:0f2ff26688b9 3:3ffa6b9e35f0 1:5cd961e4045d 2:0f2ff26688b9
2:0f2ff26688b9 0:2665aaee66e9 2:0f2ff26688b9 0:2665aaee66e9
1:5cd961e4045d 1:5cd961e4045d
0:2665aaee66e9 0:2665aaee66e9
This should use bar@rev2 as the ancestor: This should use bar@rev2 as the ancestor:
$ hg --debug merge 3 $ hg --debug merge 3
searching for copies back to rev 1
resolving manifests resolving manifests
branchmerge: True, force: False, partial: False branchmerge: True, force: False, partial: False
ancestor: 0f2ff26688b9, local: 2263c1be0967+, remote: 3ffa6b9e35f0 ancestor: 0f2ff26688b9, local: 2263c1be0967+, remote: 3ffa6b9e35f0
preserving bar for resolve of bar preserving bar for resolve of bar
starting 4 threads for background file closing (?) starting 4 threads for background file closing (?)
bar: versions differ -> m (premerge) bar: versions differ -> m (premerge)
picked tool ':merge' for bar (binary False symlink False changedelete False) picked tool ':merge' for bar (binary False symlink False changedelete False)
merging bar merging bar

tests/test-merge-criss-cross.t

user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: 0 base summary: 0 base
$ hg merge -v --debug --tool internal:dump 5 --config merge.preferancestor='!' $ hg merge -v --debug --tool internal:dump 5 --config merge.preferancestor='!'
note: using 0f6b37dbe527 as ancestor of 3b08d01b0ab5 and adfe50279922 note: using 0f6b37dbe527 as ancestor of 3b08d01b0ab5 and adfe50279922
alternatively, use --config merge.preferancestor=40663881a6dd alternatively, use --config merge.preferancestor=40663881a6dd
searching for copies back to rev 3
resolving manifests resolving manifests
branchmerge: True, force: False, partial: False branchmerge: True, force: False, partial: False
ancestor: 0f6b37dbe527, local: 3b08d01b0ab5+, remote: adfe50279922 ancestor: 0f6b37dbe527, local: 3b08d01b0ab5+, remote: adfe50279922
preserving f2 for resolve of f2 preserving f2 for resolve of f2
f1: remote is newer -> g f1: remote is newer -> g
getting f1 getting f1
f2: versions differ -> m (premerge) f2: versions differ -> m (premerge)
picked tool ':dump' for f2 (binary False symlink False changedelete False) picked tool ':dump' for f2 (binary False symlink False changedelete False)
Redo merge with merge.preferancestor="*" to enable bid merge Redo merge with merge.preferancestor="*" to enable bid merge
$ rm f* $ rm f*
$ hg up -qC . $ hg up -qC .
$ hg merge -v --debug --tool internal:dump 5 --config merge.preferancestor="*" $ hg merge -v --debug --tool internal:dump 5 --config merge.preferancestor="*"
note: merging 3b08d01b0ab5+ and adfe50279922 using bids from ancestors 0f6b37dbe527 and 40663881a6dd note: merging 3b08d01b0ab5+ and adfe50279922 using bids from ancestors 0f6b37dbe527 and 40663881a6dd
calculating bids for ancestor 0f6b37dbe527 calculating bids for ancestor 0f6b37dbe527
searching for copies back to rev 3
resolving manifests resolving manifests
branchmerge: True, force: False, partial: False branchmerge: True, force: False, partial: False
ancestor: 0f6b37dbe527, local: 3b08d01b0ab5+, remote: adfe50279922 ancestor: 0f6b37dbe527, local: 3b08d01b0ab5+, remote: adfe50279922
f1: remote is newer -> g f1: remote is newer -> g
f2: versions differ -> m f2: versions differ -> m
calculating bids for ancestor 40663881a6dd calculating bids for ancestor 40663881a6dd
searching for copies back to rev 3
resolving manifests resolving manifests
branchmerge: True, force: False, partial: False branchmerge: True, force: False, partial: False
ancestor: 40663881a6dd, local: 3b08d01b0ab5+, remote: adfe50279922 ancestor: 40663881a6dd, local: 3b08d01b0ab5+, remote: adfe50279922
f1: versions differ -> m f1: versions differ -> m
f2: remote unchanged -> k f2: remote unchanged -> k
auction for merging merge bids auction for merging merge bids
f1: picking 'get' action f1: picking 'get' action
The other way around: The other way around:
$ hg up -C -r5 $ hg up -C -r5
2 files updated, 0 files merged, 0 files removed, 0 files unresolved 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg merge -v --debug --config merge.preferancestor="*" $ hg merge -v --debug --config merge.preferancestor="*"
note: merging adfe50279922+ and 3b08d01b0ab5 using bids from ancestors 0f6b37dbe527 and 40663881a6dd note: merging adfe50279922+ and 3b08d01b0ab5 using bids from ancestors 0f6b37dbe527 and 40663881a6dd
calculating bids for ancestor 0f6b37dbe527 calculating bids for ancestor 0f6b37dbe527
searching for copies back to rev 3
resolving manifests resolving manifests
branchmerge: True, force: False, partial: False branchmerge: True, force: False, partial: False
ancestor: 0f6b37dbe527, local: adfe50279922+, remote: 3b08d01b0ab5 ancestor: 0f6b37dbe527, local: adfe50279922+, remote: 3b08d01b0ab5
f1: remote unchanged -> k f1: remote unchanged -> k
f2: versions differ -> m f2: versions differ -> m
calculating bids for ancestor 40663881a6dd calculating bids for ancestor 40663881a6dd
searching for copies back to rev 3
resolving manifests resolving manifests
branchmerge: True, force: False, partial: False branchmerge: True, force: False, partial: False
ancestor: 40663881a6dd, local: adfe50279922+, remote: 3b08d01b0ab5 ancestor: 40663881a6dd, local: adfe50279922+, remote: 3b08d01b0ab5
f1: versions differ -> m f1: versions differ -> m
f2: remote is newer -> g f2: remote is newer -> g
auction for merging merge bids auction for merging merge bids
f1: picking 'keep' action f1: picking 'keep' action
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
$ hg up -qC $ hg up -qC
$ hg merge -v --debug --config merge.preferancestor="*" $ hg merge -v --debug --config merge.preferancestor="*"
note: merging 3b08d01b0ab5+ and adfe50279922 using bids from ancestors 0f6b37dbe527 and 40663881a6dd note: merging 3b08d01b0ab5+ and adfe50279922 using bids from ancestors 0f6b37dbe527 and 40663881a6dd
calculating bids for ancestor 0f6b37dbe527 calculating bids for ancestor 0f6b37dbe527
searching for copies back to rev 3
resolving manifests resolving manifests
branchmerge: True, force: False, partial: False branchmerge: True, force: False, partial: False
ancestor: 0f6b37dbe527, local: 3b08d01b0ab5+, remote: adfe50279922 ancestor: 0f6b37dbe527, local: 3b08d01b0ab5+, remote: adfe50279922
f1: remote is newer -> g f1: remote is newer -> g
f2: versions differ -> m f2: versions differ -> m
calculating bids for ancestor 40663881a6dd calculating bids for ancestor 40663881a6dd
searching for copies back to rev 3
resolving manifests resolving manifests
branchmerge: True, force: False, partial: False branchmerge: True, force: False, partial: False
ancestor: 40663881a6dd, local: 3b08d01b0ab5+, remote: adfe50279922 ancestor: 40663881a6dd, local: 3b08d01b0ab5+, remote: adfe50279922
f1: versions differ -> m f1: versions differ -> m
f2: remote unchanged -> k f2: remote unchanged -> k
auction for merging merge bids auction for merging merge bids
f1: picking 'get' action f1: picking 'get' action
o | 1:11b5b303e36c uninteresting change o | 1:11b5b303e36c uninteresting change
|/ |/
o 0:7b54db1ebf33 initial o 0:7b54db1ebf33 initial
$ hg merge 3 --debug $ hg merge 3 --debug
note: merging c0ef19750a22+ and 6ca01f7342b9 using bids from ancestors 11b5b303e36c and 154e6000f54e note: merging c0ef19750a22+ and 6ca01f7342b9 using bids from ancestors 11b5b303e36c and 154e6000f54e
calculating bids for ancestor 11b5b303e36c calculating bids for ancestor 11b5b303e36c
searching for copies back to rev 3
unmatched files in local: unmatched files in local:
d1/a d1/a
d1/b d1/b
unmatched files in other: unmatched files in other:
d2/b d2/b
resolving manifests resolving manifests
branchmerge: True, force: False, partial: False branchmerge: True, force: False, partial: False
ancestor: 11b5b303e36c, local: c0ef19750a22+, remote: 6ca01f7342b9 ancestor: 11b5b303e36c, local: c0ef19750a22+, remote: 6ca01f7342b9
d2/b: remote created -> g d2/b: remote created -> g
calculating bids for ancestor 154e6000f54e calculating bids for ancestor 154e6000f54e
searching for copies back to rev 3
unmatched files in other: unmatched files in other:
d2/b d2/b
all copies found (* = to merge, ! = divergent, % = renamed and deleted): all copies found (* = to merge, ! = divergent, % = renamed and deleted):
src: 'd1/b' -> dst: 'd2/b' src: 'd1/b' -> dst: 'd2/b'
checking for directory renames checking for directory renames
discovered dir src: 'd1/' -> dst: 'd2/' discovered dir src: 'd1/' -> dst: 'd2/'
resolving manifests resolving manifests
branchmerge: True, force: False, partial: False branchmerge: True, force: False, partial: False

tests/test-merge-types.t

$ rm a $ rm a
$ ln -s symlink a $ ln -s symlink a
$ hg ci -msymlink $ hg ci -msymlink
created new head created new head
Symlink is local parent, executable is other: Symlink is local parent, executable is other:
$ hg merge --debug $ hg merge --debug
searching for copies back to rev 1
resolving manifests resolving manifests
branchmerge: True, force: False, partial: False branchmerge: True, force: False, partial: False
ancestor: c334dc3be0da, local: 521a1e40188f+, remote: 3574f3e69b1c ancestor: c334dc3be0da, local: 521a1e40188f+, remote: 3574f3e69b1c
preserving a for resolve of a preserving a for resolve of a
a: versions differ -> m (premerge) a: versions differ -> m (premerge)
tool internal:merge (for pattern a) can't handle symlinks tool internal:merge (for pattern a) can't handle symlinks
couldn't find merge tool hgmerge couldn't find merge tool hgmerge
no tool found to merge a no tool found to merge a
? a.orig ? a.orig
Symlink is other parent, executable is local: Symlink is other parent, executable is local:
$ hg update -C 1 $ hg update -C 1
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg merge --debug --tool :union $ hg merge --debug --tool :union
searching for copies back to rev 1
resolving manifests resolving manifests
branchmerge: True, force: False, partial: False branchmerge: True, force: False, partial: False
ancestor: c334dc3be0da, local: 3574f3e69b1c+, remote: 521a1e40188f ancestor: c334dc3be0da, local: 3574f3e69b1c+, remote: 521a1e40188f
preserving a for resolve of a preserving a for resolve of a
a: versions differ -> m (premerge) a: versions differ -> m (premerge)
picked tool ':union' for a (binary False symlink True changedelete False) picked tool ':union' for a (binary False symlink True changedelete False)
merging a merging a
my a@3574f3e69b1c+ other a@521a1e40188f ancestor a@c334dc3be0da my a@3574f3e69b1c+ other a@521a1e40188f ancestor a@c334dc3be0da
warning: internal :union cannot merge symlinks for a warning: internal :union cannot merge symlinks for a
warning: conflicts while merging a! (edit, then use 'hg resolve --mark') warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
0 files updated, 0 files merged, 0 files removed, 1 files unresolved 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
[1] [1]
$ tellmeabout a $ tellmeabout a
a is an executable file with content: a is an executable file with content:
a a
$ hg update -C 1 $ hg update -C 1
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg merge --debug --tool :merge3 $ hg merge --debug --tool :merge3
searching for copies back to rev 1
resolving manifests resolving manifests
branchmerge: True, force: False, partial: False branchmerge: True, force: False, partial: False
ancestor: c334dc3be0da, local: 3574f3e69b1c+, remote: 521a1e40188f ancestor: c334dc3be0da, local: 3574f3e69b1c+, remote: 521a1e40188f
preserving a for resolve of a preserving a for resolve of a
a: versions differ -> m (premerge) a: versions differ -> m (premerge)
picked tool ':merge3' for a (binary False symlink True changedelete False) picked tool ':merge3' for a (binary False symlink True changedelete False)
merging a merging a
my a@3574f3e69b1c+ other a@521a1e40188f ancestor a@c334dc3be0da my a@3574f3e69b1c+ other a@521a1e40188f ancestor a@c334dc3be0da
warning: internal :merge3 cannot merge symlinks for a warning: internal :merge3 cannot merge symlinks for a
warning: conflicts while merging a! (edit, then use 'hg resolve --mark') warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
0 files updated, 0 files merged, 0 files removed, 1 files unresolved 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
[1] [1]
$ tellmeabout a $ tellmeabout a
a is an executable file with content: a is an executable file with content:
a a
$ hg update -C 1 $ hg update -C 1
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg merge --debug --tool :merge-local $ hg merge --debug --tool :merge-local
searching for copies back to rev 1
resolving manifests resolving manifests
branchmerge: True, force: False, partial: False branchmerge: True, force: False, partial: False
ancestor: c334dc3be0da, local: 3574f3e69b1c+, remote: 521a1e40188f ancestor: c334dc3be0da, local: 3574f3e69b1c+, remote: 521a1e40188f
preserving a for resolve of a preserving a for resolve of a
a: versions differ -> m (premerge) a: versions differ -> m (premerge)
picked tool ':merge-local' for a (binary False symlink True changedelete False) picked tool ':merge-local' for a (binary False symlink True changedelete False)
merging a merging a
my a@3574f3e69b1c+ other a@521a1e40188f ancestor a@c334dc3be0da my a@3574f3e69b1c+ other a@521a1e40188f ancestor a@c334dc3be0da
warning: internal :merge-local cannot merge symlinks for a warning: internal :merge-local cannot merge symlinks for a
0 files updated, 0 files merged, 0 files removed, 1 files unresolved 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
[1] [1]
$ tellmeabout a $ tellmeabout a
a is an executable file with content: a is an executable file with content:
a a
$ hg update -C 1 $ hg update -C 1
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg merge --debug --tool :merge-other $ hg merge --debug --tool :merge-other
searching for copies back to rev 1
resolving manifests resolving manifests
branchmerge: True, force: False, partial: False branchmerge: True, force: False, partial: False
ancestor: c334dc3be0da, local: 3574f3e69b1c+, remote: 521a1e40188f ancestor: c334dc3be0da, local: 3574f3e69b1c+, remote: 521a1e40188f
preserving a for resolve of a preserving a for resolve of a
a: versions differ -> m (premerge) a: versions differ -> m (premerge)
picked tool ':merge-other' for a (binary False symlink True changedelete False) picked tool ':merge-other' for a (binary False symlink True changedelete False)
merging a merging a
my a@3574f3e69b1c+ other a@521a1e40188f ancestor a@c334dc3be0da my a@3574f3e69b1c+ other a@521a1e40188f ancestor a@c334dc3be0da
$ hg st $ hg st
? a.orig ? a.orig
Update to link with local change should cause a merge prompt (issue3200): Update to link with local change should cause a merge prompt (issue3200):
$ hg up -Cq 0 $ hg up -Cq 0
$ echo data > a $ echo data > a
$ HGMERGE= hg up -y --debug --config ui.merge= $ HGMERGE= hg up -y --debug --config ui.merge=
searching for copies back to rev 2
resolving manifests resolving manifests
branchmerge: False, force: False, partial: False branchmerge: False, force: False, partial: False
ancestor: c334dc3be0da, local: c334dc3be0da+, remote: 521a1e40188f ancestor: c334dc3be0da, local: c334dc3be0da+, remote: 521a1e40188f
preserving a for resolve of a preserving a for resolve of a
a: versions differ -> m (premerge) a: versions differ -> m (premerge)
(couldn't find merge tool hgmerge|tool hgmerge can't handle symlinks) (re) (couldn't find merge tool hgmerge|tool hgmerge can't handle symlinks) (re)
no tool found to merge a no tool found to merge a
picked tool ':prompt' for a (binary False symlink True changedelete False) picked tool ':prompt' for a (binary False symlink True changedelete False)

tests/test-merge7.t

searching for changes searching for changes
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads) added 1 changesets with 1 changes to 1 files (+1 heads)
new changesets 40d11a4173a8 new changesets 40d11a4173a8
(run 'hg heads' to see heads, 'hg merge' to merge) (run 'hg heads' to see heads, 'hg merge' to merge)
$ hg merge --debug $ hg merge --debug
searching for copies back to rev 1
resolving manifests resolving manifests
branchmerge: True, force: False, partial: False branchmerge: True, force: False, partial: False
ancestor: 96b70246a118, local: 50c3a7e29886+, remote: 40d11a4173a8 ancestor: 96b70246a118, local: 50c3a7e29886+, remote: 40d11a4173a8
preserving test.txt for resolve of test.txt preserving test.txt for resolve of test.txt
starting 4 threads for background file closing (?) starting 4 threads for background file closing (?)
test.txt: versions differ -> m (premerge) test.txt: versions differ -> m (premerge)
picked tool ':merge' for test.txt (binary False symlink False changedelete False) picked tool ':merge' for test.txt (binary False symlink False changedelete False)
merging test.txt merging test.txt

tests/test-rebase-conflicts.t

branchmerge: False, force: True, partial: False branchmerge: False, force: True, partial: False
ancestor: d79e2059b5c0+, local: d79e2059b5c0+, remote: 4bc80088dc6b ancestor: d79e2059b5c0+, local: d79e2059b5c0+, remote: 4bc80088dc6b
f2.txt: other deleted -> r f2.txt: other deleted -> r
removing f2.txt removing f2.txt
f1.txt: remote created -> g f1.txt: remote created -> g
getting f1.txt getting f1.txt
merge against 9:e31216eec445 merge against 9:e31216eec445
detach base 8:8e4e2c1a07ae detach base 8:8e4e2c1a07ae
searching for copies back to rev 3
unmatched files in other (from topological common ancestor): unmatched files in other (from topological common ancestor):
f2.txt f2.txt
resolving manifests resolving manifests
branchmerge: True, force: True, partial: False branchmerge: True, force: True, partial: False
ancestor: 8e4e2c1a07ae, local: 4bc80088dc6b+, remote: e31216eec445 ancestor: 8e4e2c1a07ae, local: 4bc80088dc6b+, remote: e31216eec445
f1.txt: remote is newer -> g f1.txt: remote is newer -> g
getting f1.txt getting f1.txt
committing files: committing files:
f1.txt f1.txt
committing manifest committing manifest
committing changelog committing changelog
updating the branch cache updating the branch cache
rebased as 19c888675e13 rebased as 19c888675e13
rebase status stored rebase status stored
rebasing 10:2f2496ddf49d "merge" (tip) rebasing 10:2f2496ddf49d "merge" (tip)
future parents are 11 and 7 future parents are 11 and 7
already in destination already in destination
merge against 10:2f2496ddf49d merge against 10:2f2496ddf49d
detach base 9:e31216eec445 detach base 9:e31216eec445
searching for copies back to rev 3
unmatched files in other (from topological common ancestor): unmatched files in other (from topological common ancestor):
f2.txt f2.txt
resolving manifests resolving manifests
branchmerge: True, force: True, partial: False branchmerge: True, force: True, partial: False
ancestor: e31216eec445, local: 19c888675e13+, remote: 2f2496ddf49d ancestor: e31216eec445, local: 19c888675e13+, remote: 2f2496ddf49d
f1.txt: remote is newer -> g f1.txt: remote is newer -> g
getting f1.txt getting f1.txt
committing files: committing files:

tests/test-rename-dir-merge.t

2 files updated, 0 files merged, 2 files removed, 0 files unresolved 2 files updated, 0 files merged, 2 files removed, 0 files unresolved
$ echo baz > a/c $ echo baz > a/c
$ echo quux > a/d $ echo quux > a/d
$ hg add a/c $ hg add a/c
$ hg ci -m "2 add a/c" $ hg ci -m "2 add a/c"
created new head created new head
$ hg merge --debug 1 $ hg merge --debug 1
searching for copies back to rev 1
unmatched files in local: unmatched files in local:
a/c a/c
unmatched files in other: unmatched files in other:
b/a b/a
b/b b/b
all copies found (* = to merge, ! = divergent, % = renamed and deleted): all copies found (* = to merge, ! = divergent, % = renamed and deleted):
src: 'a/a' -> dst: 'b/a' src: 'a/a' -> dst: 'b/a'
src: 'a/b' -> dst: 'b/b' src: 'a/b' -> dst: 'b/b'
? a/d ? a/d
$ hg ci -m "3 merge 2+1" $ hg ci -m "3 merge 2+1"
$ hg debugrename b/c $ hg debugrename b/c
b/c renamed from a/c:354ae8da6e890359ef49ade27b68bbc361f3ca88 b/c renamed from a/c:354ae8da6e890359ef49ade27b68bbc361f3ca88
$ hg co -C 1 $ hg co -C 1
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg merge --debug 2 $ hg merge --debug 2
searching for copies back to rev 1
unmatched files in local: unmatched files in local:
b/a b/a
b/b b/b
unmatched files in other: unmatched files in other:
a/c a/c
all copies found (* = to merge, ! = divergent, % = renamed and deleted): all copies found (* = to merge, ! = divergent, % = renamed and deleted):
src: 'a/a' -> dst: 'b/a' src: 'a/a' -> dst: 'b/a'
src: 'a/b' -> dst: 'b/b' src: 'a/b' -> dst: 'b/b'

tests/test-rename-merge1.t

$ echo blahblah > a $ echo blahblah > a
$ echo blahblah > a2 $ echo blahblah > a2
$ hg mv a2 c2 $ hg mv a2 c2
$ hg ci -m "modify" $ hg ci -m "modify"
created new head created new head
$ hg merge -y --debug $ hg merge -y --debug
searching for copies back to rev 1
unmatched files in local: unmatched files in local:
c2 c2
unmatched files in other: unmatched files in other:
b b
b2 b2
all copies found (* = to merge, ! = divergent, % = renamed and deleted): all copies found (* = to merge, ! = divergent, % = renamed and deleted):
src: 'a' -> dst: 'b' * src: 'a' -> dst: 'b' *
src: 'a2' -> dst: 'b2' ! src: 'a2' -> dst: 'b2' !
$ hg mv file newfile $ hg mv file newfile
$ hg commit -m "renamed file" $ hg commit -m "renamed file"
$ hg update 0 $ hg update 0
1 files updated, 0 files merged, 1 files removed, 0 files unresolved 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg rm file $ hg rm file
$ hg commit -m "deleted file" $ hg commit -m "deleted file"
created new head created new head
$ hg merge --debug $ hg merge --debug
searching for copies back to rev 1
unmatched files in other: unmatched files in other:
newfile newfile
all copies found (* = to merge, ! = divergent, % = renamed and deleted): all copies found (* = to merge, ! = divergent, % = renamed and deleted):
src: 'file' -> dst: 'newfile' % src: 'file' -> dst: 'newfile' %
checking for directory renames checking for directory renames
resolving manifests resolving manifests
branchmerge: True, force: False, partial: False branchmerge: True, force: False, partial: False
ancestor: 19d7f95df299, local: 0084274f6b67+, remote: 5d32493049f0 ancestor: 19d7f95df299, local: 0084274f6b67+, remote: 5d32493049f0

tests/test-rename-merge2.t

$ um() { up $1; hg mv $1 $2; } $ um() { up $1; hg mv $1 $2; }
$ nc() { hg cp $1 $2; } # just copy $ nc() { hg cp $1 $2; } # just copy
$ nm() { hg mv $1 $2; } # just move $ nm() { hg mv $1 $2; } # just move
$ tm "up a " "nc a b" " " "1 get local a to b" $ tm "up a " "nc a b" " " "1 get local a to b"
created new head created new head
-------------- --------------
test L:up a R:nc a b W: - 1 get local a to b test L:up a R:nc a b W: - 1 get local a to b
-------------- --------------
searching for copies back to rev 1
unmatched files in other: unmatched files in other:
b b
all copies found (* = to merge, ! = divergent, % = renamed and deleted): all copies found (* = to merge, ! = divergent, % = renamed and deleted):
src: 'a' -> dst: 'b' * src: 'a' -> dst: 'b' *
checking for directory renames checking for directory renames
resolving manifests resolving manifests
branchmerge: True, force: False, partial: False branchmerge: True, force: False, partial: False
ancestor: 924404dff337, local: e300d1c794ec+, remote: 4ce40f5aca24 ancestor: 924404dff337, local: e300d1c794ec+, remote: 4ce40f5aca24
C a C a
-------------- --------------
$ tm "nc a b" "up a " " " "2 get rem change to a and b" $ tm "nc a b" "up a " " " "2 get rem change to a and b"
created new head created new head
-------------- --------------
test L:nc a b R:up a W: - 2 get rem change to a and b test L:nc a b R:up a W: - 2 get rem change to a and b
-------------- --------------
searching for copies back to rev 1
unmatched files in local: unmatched files in local:
b b
all copies found (* = to merge, ! = divergent, % = renamed and deleted): all copies found (* = to merge, ! = divergent, % = renamed and deleted):
src: 'a' -> dst: 'b' * src: 'a' -> dst: 'b' *
checking for directory renames checking for directory renames
resolving manifests resolving manifests
branchmerge: True, force: False, partial: False branchmerge: True, force: False, partial: False
ancestor: 924404dff337, local: 86a2aa42fc76+, remote: f4db7e329e71 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: f4db7e329e71
a a
-------------- --------------
$ tm "up a " "nm a b" " " "3 get local a change to b, remove a" $ tm "up a " "nm a b" " " "3 get local a change to b, remove a"
created new head created new head
-------------- --------------
test L:up a R:nm a b W: - 3 get local a change to b, remove a test L:up a R:nm a b W: - 3 get local a change to b, remove a
-------------- --------------
searching for copies back to rev 1
unmatched files in other: unmatched files in other:
b b
all copies found (* = to merge, ! = divergent, % = renamed and deleted): all copies found (* = to merge, ! = divergent, % = renamed and deleted):
src: 'a' -> dst: 'b' * src: 'a' -> dst: 'b' *
checking for directory renames checking for directory renames
resolving manifests resolving manifests
branchmerge: True, force: False, partial: False branchmerge: True, force: False, partial: False
ancestor: 924404dff337, local: e300d1c794ec+, remote: bdb19105162a ancestor: 924404dff337, local: e300d1c794ec+, remote: bdb19105162a
a a
-------------- --------------
$ tm "nm a b" "up a " " " "4 get remote change to b" $ tm "nm a b" "up a " " " "4 get remote change to b"
created new head created new head
-------------- --------------
test L:nm a b R:up a W: - 4 get remote change to b test L:nm a b R:up a W: - 4 get remote change to b
-------------- --------------
searching for copies back to rev 1
unmatched files in local: unmatched files in local:
b b
all copies found (* = to merge, ! = divergent, % = renamed and deleted): all copies found (* = to merge, ! = divergent, % = renamed and deleted):
src: 'a' -> dst: 'b' * src: 'a' -> dst: 'b' *
checking for directory renames checking for directory renames
resolving manifests resolving manifests
branchmerge: True, force: False, partial: False branchmerge: True, force: False, partial: False
ancestor: 924404dff337, local: 02963e448370+, remote: f4db7e329e71 ancestor: 924404dff337, local: 02963e448370+, remote: f4db7e329e71
a a
-------------- --------------
$ tm " " "nc a b" " " "5 get b" $ tm " " "nc a b" " " "5 get b"
created new head created new head
-------------- --------------
test L: R:nc a b W: - 5 get b test L: R:nc a b W: - 5 get b
-------------- --------------
searching for copies back to rev 1
unmatched files in other: unmatched files in other:
b b
all copies found (* = to merge, ! = divergent, % = renamed and deleted): all copies found (* = to merge, ! = divergent, % = renamed and deleted):
src: 'a' -> dst: 'b' src: 'a' -> dst: 'b'
checking for directory renames checking for directory renames
resolving manifests resolving manifests
branchmerge: True, force: False, partial: False branchmerge: True, force: False, partial: False
ancestor: 924404dff337, local: 94b33a1b7f2d+, remote: 4ce40f5aca24 ancestor: 924404dff337, local: 94b33a1b7f2d+, remote: 4ce40f5aca24
C a C a
-------------- --------------
$ tm "nc a b" " " " " "6 nothing" $ tm "nc a b" " " " " "6 nothing"
created new head created new head
-------------- --------------
test L:nc a b R: W: - 6 nothing test L:nc a b R: W: - 6 nothing
-------------- --------------
searching for copies back to rev 1
unmatched files in local: unmatched files in local:
b b
all copies found (* = to merge, ! = divergent, % = renamed and deleted): all copies found (* = to merge, ! = divergent, % = renamed and deleted):
src: 'a' -> dst: 'b' src: 'a' -> dst: 'b'
checking for directory renames checking for directory renames
resolving manifests resolving manifests
branchmerge: True, force: False, partial: False branchmerge: True, force: False, partial: False
ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 97c705ade336 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 97c705ade336
C b C b
-------------- --------------
$ tm " " "nm a b" " " "7 get b" $ tm " " "nm a b" " " "7 get b"
created new head created new head
-------------- --------------
test L: R:nm a b W: - 7 get b test L: R:nm a b W: - 7 get b
-------------- --------------
searching for copies back to rev 1
unmatched files in other: unmatched files in other:
b b
all copies found (* = to merge, ! = divergent, % = renamed and deleted): all copies found (* = to merge, ! = divergent, % = renamed and deleted):
src: 'a' -> dst: 'b' src: 'a' -> dst: 'b'
checking for directory renames checking for directory renames
resolving manifests resolving manifests
branchmerge: True, force: False, partial: False branchmerge: True, force: False, partial: False
ancestor: 924404dff337, local: 94b33a1b7f2d+, remote: bdb19105162a ancestor: 924404dff337, local: 94b33a1b7f2d+, remote: bdb19105162a
M b M b
-------------- --------------
$ tm "nm a b" " " " " "8 nothing" $ tm "nm a b" " " " " "8 nothing"
created new head created new head
-------------- --------------
test L:nm a b R: W: - 8 nothing test L:nm a b R: W: - 8 nothing
-------------- --------------
searching for copies back to rev 1
unmatched files in local: unmatched files in local:
b b
all copies found (* = to merge, ! = divergent, % = renamed and deleted): all copies found (* = to merge, ! = divergent, % = renamed and deleted):
src: 'a' -> dst: 'b' src: 'a' -> dst: 'b'
checking for directory renames checking for directory renames
resolving manifests resolving manifests
branchmerge: True, force: False, partial: False branchmerge: True, force: False, partial: False
ancestor: 924404dff337, local: 02963e448370+, remote: 97c705ade336 ancestor: 924404dff337, local: 02963e448370+, remote: 97c705ade336
C b C b
-------------- --------------
$ 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
unmatched files new in both: unmatched files new in both:
b b
all copies found (* = to merge, ! = divergent, % = renamed and deleted): all copies found (* = to merge, ! = divergent, % = renamed and deleted):
src: 'a' -> dst: 'b' * src: 'a' -> dst: 'b' *
checking for directory renames 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
m "um a c" "um x c" " " "10 do merge with no ancestor" m "um a c" "um x c" " " "10 do merge with no ancestor"
$ tm "nm a b" "nm a c" " " "11 get c, keep b" $ tm "nm a b" "nm a c" " " "11 get c, keep b"
created new head created new head
-------------- --------------
test L:nm a b R:nm a c W: - 11 get c, keep b test L:nm a b R:nm a c W: - 11 get c, keep b
-------------- --------------
searching for copies back to rev 1
unmatched files in local: unmatched files in local:
b b
unmatched files in other: unmatched files in other:
c c
all copies found (* = to merge, ! = divergent, % = renamed and deleted): all copies found (* = to merge, ! = divergent, % = renamed and deleted):
src: 'a' -> dst: 'b' ! src: 'a' -> dst: 'b' !
src: 'a' -> dst: 'c' ! src: 'a' -> dst: 'c' !
checking for directory renames checking for directory renames
C b C b
-------------- --------------
$ tm "nc a b" "up b " " " "12 merge b no ancestor" $ tm "nc a b" "up b " " " "12 merge b no ancestor"
created new head created new head
-------------- --------------
test L:nc a b R:up b W: - 12 merge b no ancestor test L:nc a b R:up b W: - 12 merge b no ancestor
-------------- --------------
searching for copies back to rev 1
unmatched files new in both: unmatched files new in both:
b b
resolving manifests resolving manifests
branchmerge: True, force: False, partial: False branchmerge: True, force: False, partial: False
ancestor: 924404dff337, local: 86a2aa42fc76+, remote: af30c7647fc7 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: af30c7647fc7
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 (?)
C a C a
-------------- --------------
$ tm "up b " "nm a b" " " "13 merge b no ancestor" $ tm "up b " "nm a b" " " "13 merge b no ancestor"
created new head created new head
-------------- --------------
test L:up b R:nm a b W: - 13 merge b no ancestor test L:up b R:nm a b W: - 13 merge b no ancestor
-------------- --------------
searching for copies back to rev 1
unmatched files new in both: unmatched files new in both:
b b
resolving manifests resolving manifests
branchmerge: True, force: False, partial: False branchmerge: True, force: False, partial: False
ancestor: 924404dff337, local: 59318016310c+, remote: bdb19105162a ancestor: 924404dff337, local: 59318016310c+, remote: bdb19105162a
preserving b for resolve of b preserving b for resolve of b
preserving rev for resolve of rev preserving rev for resolve of rev
a: other deleted -> r a: other deleted -> r
M b M b
-------------- --------------
$ tm "nc a b" "up a b" " " "14 merge b no ancestor" $ tm "nc a b" "up a b" " " "14 merge b no ancestor"
created new head created new head
-------------- --------------
test L:nc a b R:up a b W: - 14 merge b no ancestor test L:nc a b R:up a b W: - 14 merge b no ancestor
-------------- --------------
searching for copies back to rev 1
unmatched files new in both: unmatched files new in both:
b b
resolving manifests resolving manifests
branchmerge: True, force: False, partial: False branchmerge: True, force: False, partial: False
ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 8dbce441892a ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 8dbce441892a
preserving b for resolve of b preserving b for resolve of b
preserving rev for resolve of rev preserving rev for resolve of rev
a: remote is newer -> g a: remote is newer -> g
M b M b
-------------- --------------
$ tm "up b " "nm a b" " " "15 merge b no ancestor, remove a" $ tm "up b " "nm a b" " " "15 merge b no ancestor, remove a"
created new head created new head
-------------- --------------
test L:up b R:nm a b W: - 15 merge b no ancestor, remove a test L:up b R:nm a b W: - 15 merge b no ancestor, remove a
-------------- --------------
searching for copies back to rev 1
unmatched files new in both: unmatched files new in both:
b b
resolving manifests resolving manifests
branchmerge: True, force: False, partial: False branchmerge: True, force: False, partial: False
ancestor: 924404dff337, local: 59318016310c+, remote: bdb19105162a ancestor: 924404dff337, local: 59318016310c+, remote: bdb19105162a
preserving b for resolve of b preserving b for resolve of b
preserving rev for resolve of rev preserving rev for resolve of rev
a: other deleted -> r a: other deleted -> r
M b M b
-------------- --------------
$ tm "nc a b" "up a b" " " "16 get a, merge b no ancestor" $ tm "nc a b" "up a b" " " "16 get a, merge b no ancestor"
created new head created new head
-------------- --------------
test L:nc a b R:up a b W: - 16 get a, merge b no ancestor test L:nc a b R:up a b W: - 16 get a, merge b no ancestor
-------------- --------------
searching for copies back to rev 1
unmatched files new in both: unmatched files new in both:
b b
resolving manifests resolving manifests
branchmerge: True, force: False, partial: False branchmerge: True, force: False, partial: False
ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 8dbce441892a ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 8dbce441892a
preserving b for resolve of b preserving b for resolve of b
preserving rev for resolve of rev preserving rev for resolve of rev
a: remote is newer -> g a: remote is newer -> g
M b M b
-------------- --------------
$ tm "up a b" "nc a b" " " "17 keep a, merge b no ancestor" $ tm "up a b" "nc a b" " " "17 keep a, merge b no ancestor"
created new head created new head
-------------- --------------
test L:up a b R:nc a b W: - 17 keep a, merge b no ancestor test L:up a b R:nc a b W: - 17 keep a, merge b no ancestor
-------------- --------------
searching for copies back to rev 1
unmatched files new in both: unmatched files new in both:
b b
resolving manifests resolving manifests
branchmerge: True, force: False, partial: False branchmerge: True, force: False, partial: False
ancestor: 924404dff337, local: 0b76e65c8289+, remote: 4ce40f5aca24 ancestor: 924404dff337, local: 0b76e65c8289+, remote: 4ce40f5aca24
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 (?)
C a C a
-------------- --------------
$ tm "nm a b" "up a b" " " "18 merge b no ancestor" $ tm "nm a b" "up a b" " " "18 merge b no ancestor"
created new head created new head
-------------- --------------
test L:nm a b R:up a b W: - 18 merge b no ancestor test L:nm a b R:up a b W: - 18 merge b no ancestor
-------------- --------------
searching for copies back to rev 1
unmatched files new in both: unmatched files new in both:
b b
resolving manifests resolving manifests
branchmerge: True, force: False, partial: False branchmerge: True, force: False, partial: False
ancestor: 924404dff337, local: 02963e448370+, remote: 8dbce441892a ancestor: 924404dff337, local: 02963e448370+, remote: 8dbce441892a
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 (?)
abort: unresolved merge conflicts (see 'hg help resolve') abort: unresolved merge conflicts (see 'hg help resolve')
-------------- --------------
$ tm "up a b" "nm a b" " " "19 merge b no ancestor, prompt remove a" $ tm "up a b" "nm a b" " " "19 merge b no ancestor, prompt remove a"
created new head created new head
-------------- --------------
test L:up a b R:nm a b W: - 19 merge b no ancestor, prompt remove a test L:up a b R:nm a b W: - 19 merge b no ancestor, prompt remove a
-------------- --------------
searching for copies back to rev 1
unmatched files new in both: unmatched files new in both:
b b
resolving manifests resolving manifests
branchmerge: True, force: False, partial: False branchmerge: True, force: False, partial: False
ancestor: 924404dff337, local: 0b76e65c8289+, remote: bdb19105162a ancestor: 924404dff337, local: 0b76e65c8289+, remote: bdb19105162a
preserving a for resolve of a preserving a for resolve of a
preserving b for resolve of b preserving b for resolve of b
preserving rev for resolve of rev preserving rev for resolve of rev
abort: unresolved merge conflicts (see 'hg help resolve') abort: unresolved merge conflicts (see 'hg help resolve')
-------------- --------------
$ tm "up a " "um a b" " " "20 merge a and b to b, remove a" $ tm "up a " "um a b" " " "20 merge a and b to b, remove a"
created new head created new head
-------------- --------------
test L:up a R:um a b W: - 20 merge a and b to b, remove a test L:up a R:um a b W: - 20 merge a and b to b, remove a
-------------- --------------
searching for copies back to rev 1
unmatched files in other: unmatched files in other:
b b
all copies found (* = to merge, ! = divergent, % = renamed and deleted): all copies found (* = to merge, ! = divergent, % = renamed and deleted):
src: 'a' -> dst: 'b' * src: 'a' -> dst: 'b' *
checking for directory renames checking for directory renames
resolving manifests resolving manifests
branchmerge: True, force: False, partial: False branchmerge: True, force: False, partial: False
ancestor: 924404dff337, local: e300d1c794ec+, remote: 49b6d8032493 ancestor: 924404dff337, local: e300d1c794ec+, remote: 49b6d8032493
a a
-------------- --------------
$ tm "um a b" "up a " " " "21 merge a and b to b" $ tm "um a b" "up a " " " "21 merge a and b to b"
created new head created new head
-------------- --------------
test L:um a b R:up a W: - 21 merge a and b to b test L:um a b R:up a W: - 21 merge a and b to b
-------------- --------------
searching for copies back to rev 1
unmatched files in local: unmatched files in local:
b b
all copies found (* = to merge, ! = divergent, % = renamed and deleted): all copies found (* = to merge, ! = divergent, % = renamed and deleted):
src: 'a' -> dst: 'b' * src: 'a' -> dst: 'b' *
checking for directory renames 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: f4db7e329e71 ancestor: 924404dff337, local: 62e7bf090eba+, remote: f4db7e329e71
m "nm a b" "um x a" " " "22 get a, keep b" m "nm a b" "um x a" " " "22 get a, keep b"
$ tm "nm a b" "up a c" " " "23 get c, keep b" $ tm "nm a b" "up a c" " " "23 get c, keep b"
created new head created new head
-------------- --------------
test L:nm a b R:up a c W: - 23 get c, keep b test L:nm a b R:up a c W: - 23 get c, keep b
-------------- --------------
searching for copies back to rev 1
unmatched files in local: unmatched files in local:
b b
unmatched files in other: unmatched files in other:
c c
all copies found (* = to merge, ! = divergent, % = renamed and deleted): all copies found (* = to merge, ! = divergent, % = renamed and deleted):
src: 'a' -> dst: 'b' * src: 'a' -> dst: 'b' *
checking for directory renames checking for directory renames
resolving manifests resolving manifests
$ hg mv 4/f 4/g $ hg mv 4/f 4/g
$ for x in */*; do echo m2 > $x; done $ for x in */*; do echo m2 > $x; done
$ hg ci -Aqm "m2" $ hg ci -Aqm "m2"
$ hg up -qr1 $ hg up -qr1
$ mkdir 7 8 $ mkdir 7 8
$ echo m > 7/f $ echo m > 7/f
$ echo m > 8/f $ echo m > 8/f
$ hg merge -f --tool internal:dump -v --debug -r2 | sed '/^resolving manifests/,$d' 2> /dev/null $ hg merge -f --tool internal:dump -v --debug -r2 | sed '/^resolving manifests/,$d' 2> /dev/null
searching for copies back to rev 1
unmatched files in local: unmatched files in local:
5/g 5/g
6/g 6/g
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:

tests/test-subrepo.t

source s source s
revision fc627a69481fcbe5f1135069e8a3881c023e4cf5 revision fc627a69481fcbe5f1135069e8a3881c023e4cf5
path t path t
source t source t
revision 60ca1237c19474e7a3978b0dc1ca4e6f36d51382 revision 60ca1237c19474e7a3978b0dc1ca4e6f36d51382
$ hg ci -m9 $ hg ci -m9
created new head created new head
$ hg merge 6 --debug # test change $ hg merge 6 --debug # test change
searching for copies back to rev 2
resolving manifests resolving manifests
branchmerge: True, force: False, partial: False branchmerge: True, force: False, partial: False
ancestor: 1f14a2e2d3ec, local: f0d2028bf86d+, remote: 1831e14459c4 ancestor: 1f14a2e2d3ec, local: f0d2028bf86d+, remote: 1831e14459c4
starting 4 threads for background file closing (?) starting 4 threads for background file closing (?)
.hgsubstate: versions differ -> m (premerge) .hgsubstate: versions differ -> m (premerge)
subrepo merge f0d2028bf86d+ 1831e14459c4 1f14a2e2d3ec subrepo merge f0d2028bf86d+ 1831e14459c4 1f14a2e2d3ec
subrepo t: other changed, get t:6747d179aa9a688023c4b0cad32e4c92bb7f34ad:hg subrepo t: other changed, get t:6747d179aa9a688023c4b0cad32e4c92bb7f34ad:hg
getting subrepo t getting subrepo t
revision fc627a69481fcbe5f1135069e8a3881c023e4cf5 revision fc627a69481fcbe5f1135069e8a3881c023e4cf5
path t path t
source t source t
revision 6747d179aa9a688023c4b0cad32e4c92bb7f34ad revision 6747d179aa9a688023c4b0cad32e4c92bb7f34ad
$ echo conflict > t/t $ echo conflict > t/t
$ hg ci -m10 $ hg ci -m10
committing subrepository t committing subrepository t
$ HGMERGE=internal:merge hg merge --debug 7 # test conflict $ HGMERGE=internal:merge hg merge --debug 7 # test conflict
searching for copies back to rev 2
resolving manifests resolving manifests
branchmerge: True, force: False, partial: False branchmerge: True, force: False, partial: False
ancestor: 1831e14459c4, local: e45c8b14af55+, remote: f94576341bcf ancestor: 1831e14459c4, local: e45c8b14af55+, remote: f94576341bcf
starting 4 threads for background file closing (?) starting 4 threads for background file closing (?)
.hgsubstate: versions differ -> m (premerge) .hgsubstate: versions differ -> m (premerge)
subrepo merge e45c8b14af55+ f94576341bcf 1831e14459c4 subrepo merge e45c8b14af55+ f94576341bcf 1831e14459c4
subrepo t: both sides changed subrepo t: both sides changed
subrepository t diverged (local revision: 20a0db6fbf6c, remote revision: 7af322bc1198) subrepository t diverged (local revision: 20a0db6fbf6c, remote revision: 7af322bc1198)
starting 4 threads for background file closing (?) starting 4 threads for background file closing (?)
(M)erge, keep (l)ocal [working copy] or keep (r)emote [merge rev]? m (M)erge, keep (l)ocal [working copy] or keep (r)emote [merge rev]? m
merging subrepository "t" merging subrepository "t"
searching for copies back to rev 2
resolving manifests resolving manifests
branchmerge: True, force: False, partial: False branchmerge: True, force: False, partial: False
ancestor: 6747d179aa9a, local: 20a0db6fbf6c+, remote: 7af322bc1198 ancestor: 6747d179aa9a, local: 20a0db6fbf6c+, remote: 7af322bc1198
preserving t for resolve of t preserving t for resolve of t
starting 4 threads for background file closing (?) starting 4 threads for background file closing (?)
t: versions differ -> m (premerge) t: versions differ -> m (premerge)
picked tool ':merge' for t (binary False symlink False changedelete False) picked tool ':merge' for t (binary False symlink False changedelete False)
merging t merging t

tests/test-up-local-change.t

M a M a
$ hg parents $ hg parents
changeset: 0:c19d34741b0a changeset: 0:c19d34741b0a
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: 1 summary: 1
$ hg --debug up $ hg --debug up
searching for copies back to rev 1
unmatched files in other: unmatched files in other:
b b
resolving manifests resolving manifests
branchmerge: False, force: False, partial: False branchmerge: False, force: False, partial: False
ancestor: c19d34741b0a, local: c19d34741b0a+, remote: 1e71731e6fbb ancestor: c19d34741b0a, local: c19d34741b0a+, remote: 1e71731e6fbb
preserving a for resolve of a preserving a for resolve of a
b: remote created -> g b: remote created -> g
getting b getting b
changeset: 1:1e71731e6fbb changeset: 1:1e71731e6fbb
tag: tip tag: tip
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: 2 summary: 2
$ hg --debug up 0 $ hg --debug up 0
starting 4 threads for background file closing (?) starting 4 threads for background file closing (?)
searching for copies back to rev 0
unmatched files in local (from topological common ancestor): unmatched files in local (from topological common ancestor):
b b
resolving manifests resolving manifests
branchmerge: False, force: False, partial: False branchmerge: False, force: False, partial: False
ancestor: 1e71731e6fbb, local: 1e71731e6fbb+, remote: c19d34741b0a ancestor: 1e71731e6fbb, local: 1e71731e6fbb+, remote: c19d34741b0a
preserving a for resolve of a preserving a for resolve of a
b: other deleted -> r b: other deleted -> r
removing b removing b
0 files updated, 1 files merged, 1 files removed, 0 files unresolved 0 files updated, 1 files merged, 1 files removed, 0 files unresolved
$ hg parents $ hg parents
changeset: 0:c19d34741b0a changeset: 0:c19d34741b0a
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: 1 summary: 1
$ hg --debug up $ hg --debug up
searching for copies back to rev 1
unmatched files in other: unmatched files in other:
b b
resolving manifests resolving manifests
branchmerge: False, force: False, partial: False branchmerge: False, force: False, partial: False
ancestor: c19d34741b0a, local: c19d34741b0a+, remote: 1e71731e6fbb ancestor: c19d34741b0a, local: c19d34741b0a+, remote: 1e71731e6fbb
preserving a for resolve of a preserving a for resolve of a
b: remote created -> g b: remote created -> g
getting b getting b