2010-08-18 03:42:44 +04:00
|
|
|
$ hg init
|
|
|
|
|
$ echo This is file a1 > a
|
|
|
|
|
$ hg add a
|
2010-09-03 01:22:51 +04:00
|
|
|
$ hg commit -m "commit #0"
|
2010-08-18 03:42:44 +04:00
|
|
|
$ echo This is file b1 > b
|
|
|
|
|
$ hg add b
|
2010-09-03 01:22:51 +04:00
|
|
|
$ hg commit -m "commit #1"
|
2010-08-18 03:42:44 +04:00
|
|
|
$ hg update 0
|
|
|
|
|
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
|
|
|
$ echo This is file c1 > c
|
|
|
|
|
$ hg add c
|
2010-09-03 01:22:51 +04:00
|
|
|
$ hg commit -m "commit #2"
|
2010-08-18 03:42:44 +04:00
|
|
|
created new head
|
|
|
|
|
$ hg merge 1
|
|
|
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
|
(branch merge, don't forget to commit)
|
|
|
|
|
$ rm b
|
|
|
|
|
$ echo This is file c22 > c
|
commit: abort on merge with missing files
Here is a script illustrating the previous behaviour:
The merge brings a new file 'b' from remote
$ hg merge 1 --debug
searching for copies back to rev 1
unmatched files in other:
b
resolving manifests
overwrite: False, partial: False
ancestor: 07f494440405, local: 540395c44225+, remote: 102a90ea7b4a
b: remote created -> g
updating: b 1/1 files (100.00%)
getting b
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
Delete but do not remove b
$ rm b
$ hg st
! b
The commit succeeds
$ hg commit -m merge
$ hg parents --template "{rev} {desc|firstline} files: {files}\n"
3 merge files:
$ hg st
! b
b changes were ignored, but even b existence was ignored
$ hg manifest
a
This happens because localrepo.commitctx() checks the input ctx.files(), which
is empty for workingctx.files() only returns added, modified or removed
entries, and bypass files/manifest updates completely. So the committed
revision manifest is the same as its first parent one, not containing the 'b'
file.
This patch forces the commit to abort in presence of a merge and missing files.
test-merge4.t is modified accordingly as it was introduced to check hg was not
just terminating with a traceback (5cc0d3ba11f9).
2012-04-28 17:01:57 +04:00
|
|
|
|
|
|
|
|
Test hg behaves when committing with a missing file added by a merge
|
|
|
|
|
|
2010-09-03 01:22:51 +04:00
|
|
|
$ hg commit -m "commit #3"
|
commit: abort on merge with missing files
Here is a script illustrating the previous behaviour:
The merge brings a new file 'b' from remote
$ hg merge 1 --debug
searching for copies back to rev 1
unmatched files in other:
b
resolving manifests
overwrite: False, partial: False
ancestor: 07f494440405, local: 540395c44225+, remote: 102a90ea7b4a
b: remote created -> g
updating: b 1/1 files (100.00%)
getting b
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
Delete but do not remove b
$ rm b
$ hg st
! b
The commit succeeds
$ hg commit -m merge
$ hg parents --template "{rev} {desc|firstline} files: {files}\n"
3 merge files:
$ hg st
! b
b changes were ignored, but even b existence was ignored
$ hg manifest
a
This happens because localrepo.commitctx() checks the input ctx.files(), which
is empty for workingctx.files() only returns added, modified or removed
entries, and bypass files/manifest updates completely. So the committed
revision manifest is the same as its first parent one, not containing the 'b'
file.
This patch forces the commit to abort in presence of a merge and missing files.
test-merge4.t is modified accordingly as it was introduced to check hg was not
just terminating with a traceback (5cc0d3ba11f9).
2012-04-28 17:01:57 +04:00
|
|
|
abort: cannot commit merge with missing files
|
|
|
|
|
[255]
|
2010-08-18 03:42:44 +04:00
|
|
|
|
