mirror of
https://github.com/facebook/sapling.git
synced 2024-10-06 23:07:18 +03:00
e75b9fc1b1
Summary: This commit moves most of the stuff in hgext3rd and related tests to hg-crew/hgext and hg-crew/test respectively. The things that are not moved are the ones which require some more complex imports. Depends on D6675309 Test Plan: - tests are failing at this commit, fixes are in the following commits Reviewers: #sourcecontrol Differential Revision: https://phabricator.intern.facebook.com/D6675329
93 lines
2.6 KiB
Raku
93 lines
2.6 KiB
Raku
#require p4
|
|
|
|
$ . $TESTDIR/p4setup.sh
|
|
|
|
populate the depot
|
|
$ mkdir Main
|
|
$ mkdir Main/b
|
|
$ echo '1' > Main/a
|
|
$ p4 add Main/a
|
|
//depot/Main/a#1 - opened for add
|
|
$ p4 submit -d'CL1(1)'
|
|
Submitting change 1.
|
|
Locking 1 files ...
|
|
add //depot/Main/a#1
|
|
Change 1 submitted.
|
|
|
|
$ p4 edit Main/a
|
|
//depot/Main/a#1 - opened for edit
|
|
$ echo '4' > Main/a
|
|
$ cat >desc <<EOF
|
|
> Change: new
|
|
> Client: $P4CLIENT
|
|
> User: $USER
|
|
> Status: new
|
|
> Description: CL4(2)
|
|
> Files:
|
|
> //depot/Main/a # edit
|
|
> EOF
|
|
$ p4 shelve -i < desc
|
|
Change 2 created with 1 open file(s).
|
|
Shelving files for change 2.
|
|
edit //depot/Main/a#1
|
|
Change 2 files shelved.
|
|
$ p4 reopen -c default Main/a
|
|
//depot/Main/a#1 - reopened; default change
|
|
$ echo '3' > Main/a
|
|
$ p4 submit -d'CL3(3)'
|
|
Submitting change 3.
|
|
Locking 1 files ...
|
|
edit //depot/Main/a#2
|
|
Change 3 submitted.
|
|
$ cat Main/a
|
|
3
|
|
$ p4 unshelve -s 2 -c 2
|
|
//depot/Main/a#1 - unshelved, opened for edit
|
|
$ p4 shelve -c 2 -d
|
|
Shelved change 2 deleted.
|
|
$ p4 sync
|
|
//depot/Main/a#2 - is opened and not being changed
|
|
* //depot/Main/a - must resolve #2 before submitting (glob)
|
|
$ p4 resolve -ay
|
|
$TESTTMP/p4/Main/a - vs //depot/Main/a#2
|
|
//hg-p4-import/Main/a - ignored //depot/Main/a
|
|
$ p4 submit -c 2
|
|
Submitting change 2.
|
|
Locking 1 files ...
|
|
edit //depot/Main/a#3
|
|
Change 2 renamed change 4 and submitted.
|
|
$ cat Main/a
|
|
4
|
|
|
|
Import
|
|
|
|
$ cd $hgwd
|
|
$ hg init --config 'format.usefncache=False'
|
|
$ hg p4fastimport --debug -P $P4ROOT hg-p4-import
|
|
loading changelist numbers.
|
|
3 changelists to import.
|
|
loading list of files.
|
|
1 files to import.
|
|
reading filelog * (glob)
|
|
importing repository.
|
|
writing filelog: b8e02f643373, p1 000000000000, linkrev 0, 2 bytes, src: *, path: Main/a (glob)
|
|
writing filelog: 059c099e8c05, p1 b8e02f643373, linkrev 1, 2 bytes, src: *, path: Main/a (glob)
|
|
writing filelog: de9e19b2b7a1, p1 059c099e8c05, linkrev 2, 2 bytes, src: *, path: Main/a (glob)
|
|
changelist 1: writing manifest. node: ce8f3d0156f3 p1: 000000000000 p2: 000000000000 linkrev: 0
|
|
changelist 1: writing changelog: CL1(1)
|
|
changelist 3: writing manifest. node: 63f2b10f26c4 p1: ce8f3d0156f3 p2: 000000000000 linkrev: 1
|
|
changelist 3: writing changelog: CL3(3)
|
|
changelist 4: writing manifest. node: c654b16ed766 p1: 63f2b10f26c4 p2: 000000000000 linkrev: 2
|
|
changelist 4: writing changelog: CL4(2)
|
|
updating the branch cache (?)
|
|
3 revision(s), 1 file(s) imported.
|
|
$ hg verify
|
|
checking changesets
|
|
checking manifests
|
|
crosschecking files in changesets and manifests
|
|
checking files
|
|
1 files, 3 changesets, 3 total revisions
|
|
$ hg cat -r tip Main/a
|
|
4
|
|
stopping the p4 server
|