##// END OF EJS Templates
mergestate: merge `preresolve()` into `resolve()`...
mergestate: merge `preresolve()` into `resolve()` The separation between `preresolve()` and `resolve()` was something added for the "merge driver" feature. Since we removed that in 32ce4cbaec4b (mergedriver: delete it, 2020-09-17), we don't need the separation anymore. More cleanups will follow. Differential Revision: https://phab.mercurial-scm.org/D11855

File last commit:

r49256:38941a28 default
r49256:38941a28 default
Show More
test-issue672.t
99 lines | 2.8 KiB | text/troff | Tads3Lexer
Matt Mackall
urls: bulk-change BTS urls to new location
r26420 https://bz.mercurial-scm.org/672
Adrian Buehlmann
tests: unify test-issue*
r12195
# 0-2-4
# \ \ \
# 1-3-5
#
# rename in #1, content change in #4.
$ hg init
$ touch 1
$ touch 2
$ hg commit -Am init # 0
adding 1
adding 2
$ hg rename 1 1a
$ hg commit -m rename # 1
$ hg co -C 0
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ echo unrelated >> 2
$ hg ci -m unrelated1 # 2
created new head
$ hg merge --debug 1
unmatched files in other:
1a
Thomas Arendsen Hein
merge: show renamed on one and deleted on the other side in debug output
r16795 all copies found (* = to merge, ! = divergent, % = renamed and deleted):
Martin von Zweigbergk
copies: print debug information about copies per side/branch...
r44679 on remote side:
src: '1' -> dst: '1a'
Adrian Buehlmann
tests: unify test-issue*
r12195 checking for directory renames
resolving manifests
Siddharth Agarwal
manifestmerge: pass in branchmerge and force separately...
r18605 branchmerge: True, force: False, partial: False
Martin Geisler
merge: make debug output easier to read...
r15625 ancestor: 81f4b099af3d, local: c64f439569a9+, remote: c12dcd37c90a
Adrian Buehlmann
tests: unify test-issue*
r12195 1: other deleted -> r
Bryan O'Sullivan
tests: update test output (will be folded into parent)
r18631 removing 1
Mads Kiilerich
merge: change debug logging - test output changes but no real changes...
r21391 1a: remote created -> g
Bryan O'Sullivan
tests: update test output (will be folded into parent)
r18631 getting 1a
Adrian Buehlmann
tests: unify test-issue*
r12195 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ hg ci -m merge1 # 3
$ hg co -C 2
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ echo hello >> 1
$ hg ci -m unrelated2 # 4
created new head
$ hg co -C 3
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg merge -y --debug 4
unmatched files in local:
1a
Thomas Arendsen Hein
merge: show renamed on one and deleted on the other side in debug output
r16795 all copies found (* = to merge, ! = divergent, % = renamed and deleted):
Martin von Zweigbergk
copies: print debug information about copies per side/branch...
r44679 on local side:
src: '1' -> dst: '1a' *
Adrian Buehlmann
tests: unify test-issue*
r12195 checking for directory renames
resolving manifests
Siddharth Agarwal
manifestmerge: pass in branchmerge and force separately...
r18605 branchmerge: True, force: False, partial: False
Valentin Gatien-Baron
commit: improve the files field of changelog for merges...
r42840 ancestor: c64f439569a9, local: f4a9cff3cd0b+, remote: 746e9549ea96
Matt Harbison
tests: correct the output order about starting a background thread for Windows...
r46689 starting 4 threads for background file closing (?)
Mads Kiilerich
merge: change debug logging - test output changes but no real changes...
r21391 preserving 1a for resolve of 1a
Martin von Zweigbergk
mergestate: merge `preresolve()` into `resolve()`...
r49256 1a: local copied/moved from 1 -> m
Siddharth Agarwal
filemerge: add debug output for whether this is a change/delete conflict...
r27161 picked tool ':merge' for 1a (binary False symlink False changedelete False)
Adrian Buehlmann
tests: unify test-issue*
r12195 merging 1a and 1 to 1a
Valentin Gatien-Baron
commit: improve the files field of changelog for merges...
r42840 my 1a@f4a9cff3cd0b+ other 1@746e9549ea96 ancestor 1@c64f439569a9
Adrian Buehlmann
tests: unify test-issue*
r12195 premerge successful
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ hg co -C 4
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg merge -y --debug 3
unmatched files in other:
1a
Thomas Arendsen Hein
merge: show renamed on one and deleted on the other side in debug output
r16795 all copies found (* = to merge, ! = divergent, % = renamed and deleted):
Martin von Zweigbergk
copies: print debug information about copies per side/branch...
r44679 on remote side:
src: '1' -> dst: '1a' *
Adrian Buehlmann
tests: unify test-issue*
r12195 checking for directory renames
resolving manifests
Siddharth Agarwal
manifestmerge: pass in branchmerge and force separately...
r18605 branchmerge: True, force: False, partial: False
Valentin Gatien-Baron
commit: improve the files field of changelog for merges...
r42840 ancestor: c64f439569a9, local: 746e9549ea96+, remote: f4a9cff3cd0b
Matt Harbison
tests: correct the output order about starting a background thread for Windows...
r46689 starting 4 threads for background file closing (?)
Mads Kiilerich
merge: change debug logging - test output changes but no real changes...
r21391 preserving 1 for resolve of 1a
removing 1
Martin von Zweigbergk
mergestate: merge `preresolve()` into `resolve()`...
r49256 1a: remote moved from 1 -> m
Siddharth Agarwal
filemerge: add debug output for whether this is a change/delete conflict...
r27161 picked tool ':merge' for 1a (binary False symlink False changedelete False)
Adrian Buehlmann
tests: unify test-issue*
r12195 merging 1 and 1a to 1a
Valentin Gatien-Baron
commit: improve the files field of changelog for merges...
r42840 my 1a@746e9549ea96+ other 1a@f4a9cff3cd0b ancestor 1@c64f439569a9
Adrian Buehlmann
tests: unify test-issue*
r12195 premerge successful
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)