mirror of
https://github.com/facebook/sapling.git
synced 2024-10-11 01:07:15 +03:00
e488c0e84f
The main problem was that dirstate.getcwd() returned just "", which was interpreted as "we're at the repo root". It now returns an absolute path. The util.pathto function was also changed to deal with the "cwd is an absolute path" case.
116 lines
3.4 KiB
Plaintext
116 lines
3.4 KiB
Plaintext
adding a
|
|
adding d1/d2/a
|
|
% import exported patch
|
|
requesting all changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 2 changes to 2 files
|
|
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
applying ../tip.patch
|
|
% message should be same
|
|
summary: second change
|
|
% committer should be same
|
|
user: someone
|
|
% import of plain diff should fail without message
|
|
requesting all changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 2 changes to 2 files
|
|
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
applying ../tip.patch
|
|
transaction abort!
|
|
rollback completed
|
|
% import of plain diff should be ok with message
|
|
requesting all changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 2 changes to 2 files
|
|
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
applying ../tip.patch
|
|
% hg -R repo import
|
|
requesting all changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 2 changes to 2 files
|
|
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
applying tip.patch
|
|
% import from stdin
|
|
requesting all changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 2 changes to 2 files
|
|
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
applying patch from stdin
|
|
% override commit message
|
|
requesting all changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 2 changes to 2 files
|
|
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
applying patch from stdin
|
|
summary: override
|
|
% plain diff in email, subject, message body
|
|
requesting all changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 2 changes to 2 files
|
|
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
applying ../msg.patch
|
|
user: email patcher
|
|
summary: email patch
|
|
% plain diff in email, no subject, message body
|
|
requesting all changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 2 changes to 2 files
|
|
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
applying patch from stdin
|
|
% plain diff in email, subject, no message body
|
|
requesting all changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 2 changes to 2 files
|
|
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
applying patch from stdin
|
|
% plain diff in email, no subject, no message body, should fail
|
|
requesting all changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 2 changes to 2 files
|
|
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
applying patch from stdin
|
|
transaction abort!
|
|
rollback completed
|
|
% hg export in email, should use patch header
|
|
requesting all changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 2 changes to 2 files
|
|
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
applying patch from stdin
|
|
summary: second change
|
|
% hg import in a subdirectory
|
|
requesting all changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 2 changes to 2 files
|
|
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
applying ../../../tip.patch
|
|
% message should be 'subdir change'
|
|
summary: subdir change
|
|
% committer should be 'someoneelse'
|
|
user: someoneelse
|
|
% should be empty
|