mirror of
https://github.com/facebook/sapling.git
synced 2024-10-09 16:31:02 +03:00
a3a02abd7a
Summary: I am debugging why some people get vim to pop up during a merge conflict and some do not. also fixes a few lint issues Reviewed By: DurhamG Differential Revision: D27684419 fbshipit-source-id: f636d71c18353a3816d1e442c05790cf4fd7b90b
101 lines
3.0 KiB
Perl
101 lines
3.0 KiB
Perl
#chg-compatible
|
|
|
|
https://bz.mercurial-scm.org/672
|
|
|
|
# 0-2-4
|
|
# \ \ \
|
|
# 1-3-5
|
|
#
|
|
# rename in #1, content change in #4.
|
|
|
|
$ hg init repo
|
|
$ cd repo
|
|
|
|
$ 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 'desc(init)'
|
|
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
|
|
$ echo unrelated >> 2
|
|
$ hg ci -m unrelated1 # 2
|
|
|
|
$ hg merge --debug 'desc(rename)'
|
|
searching for copies back to c12dcd37c90a
|
|
unmatched files in other:
|
|
1a
|
|
all copies found (* = to merge, ! = divergent, % = renamed and deleted):
|
|
src: '1' -> dst: '1a'
|
|
checking for directory renames
|
|
resolving manifests
|
|
branchmerge: True, force: False, partial: False
|
|
ancestor: 81f4b099af3d, local: c64f439569a9+, remote: c12dcd37c90a
|
|
1: other deleted -> r
|
|
removing 1
|
|
1a: remote created -> g
|
|
getting 1a
|
|
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 'desc(unrelated1)'
|
|
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
|
|
$ echo hello >> 1
|
|
$ hg ci -m unrelated2 # 4
|
|
|
|
$ hg co -C 'desc(merge1)'
|
|
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
|
|
$ hg merge -y --debug 'desc(unrelated2)'
|
|
searching for copies back to c12dcd37c90a
|
|
unmatched files in local:
|
|
1a
|
|
all copies found (* = to merge, ! = divergent, % = renamed and deleted):
|
|
src: '1' -> dst: '1a' *
|
|
checking for directory renames
|
|
resolving manifests
|
|
branchmerge: True, force: False, partial: False
|
|
ancestor: c64f439569a9, local: e327dca35ac8+, remote: 746e9549ea96
|
|
preserving 1a for resolve of 1a
|
|
1a: local copied/moved from 1 -> m (premerge)
|
|
picktool() hgmerge internal:merge
|
|
picked tool ':merge' for 1a (binary False symlink False changedelete False)
|
|
merging 1a and 1 to 1a
|
|
my 1a@e327dca35ac8+ other 1@746e9549ea96 ancestor 1@c64f439569a9
|
|
premerge successful
|
|
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
|
|
(branch merge, don't forget to commit)
|
|
|
|
$ hg co -C 'desc(unrelated2)'
|
|
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
|
|
$ hg merge -y --debug 'desc(merge1)'
|
|
searching for copies back to c12dcd37c90a
|
|
unmatched files in other:
|
|
1a
|
|
all copies found (* = to merge, ! = divergent, % = renamed and deleted):
|
|
src: '1' -> dst: '1a' *
|
|
checking for directory renames
|
|
resolving manifests
|
|
branchmerge: True, force: False, partial: False
|
|
ancestor: c64f439569a9, local: 746e9549ea96+, remote: e327dca35ac8
|
|
preserving 1 for resolve of 1a
|
|
removing 1
|
|
1a: remote moved from 1 -> m (premerge)
|
|
picktool() hgmerge internal:merge
|
|
picked tool ':merge' for 1a (binary False symlink False changedelete False)
|
|
merging 1 and 1a to 1a
|
|
my 1a@746e9549ea96+ other 1a@e327dca35ac8 ancestor 1@c64f439569a9
|
|
premerge successful
|
|
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
|
|
(branch merge, don't forget to commit)
|
|
|