mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 15:27:13 +03:00
cc612c476f
Many tests fixed the commit date of their changesets at '1000000 0' or similar. However testing with "Mon Jan 12 13:46:40 1970 +0000" is not better than testing with "Thu Jan 01 00:00:00 1970 +0000", which is the default run-tests.py installs. Removing the unnecessary flag removes some clutter and will hopefully make it clearer what the tests are really trying to test. Some tests did not even change their output when the dates were changed, in which case the -d flag was truly irrelevant. Dates used in sequence (such as '0 0', '1 0', etc...) were left alone since they may make the test easier to understand.
52 lines
1.3 KiB
Perl
52 lines
1.3 KiB
Perl
Test for changeset 9fe267f77f56ff127cf7e65dc15dd9de71ce8ceb
|
|
(merge correctly when all the files in a directory are moved
|
|
but then local changes are added in the same directory)
|
|
|
|
$ hg init a
|
|
$ cd a
|
|
$ mkdir -p testdir
|
|
$ echo a > testdir/a
|
|
$ hg add testdir/a
|
|
$ hg commit -m a
|
|
$ cd ..
|
|
|
|
$ hg clone a b
|
|
updating to branch default
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ cd a
|
|
$ echo alpha > testdir/a
|
|
$ hg commit -m remote-change
|
|
$ cd ..
|
|
|
|
$ cd b
|
|
$ mkdir testdir/subdir
|
|
$ hg mv testdir/a testdir/subdir/a
|
|
$ hg commit -m move
|
|
$ mkdir newdir
|
|
$ echo beta > newdir/beta
|
|
$ hg add newdir/beta
|
|
$ hg commit -m local-addition
|
|
$ hg pull ../a
|
|
pulling from ../a
|
|
searching for changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 1 changes to 1 files (+1 heads)
|
|
(run 'hg heads' to see heads, 'hg merge' to merge)
|
|
$ hg up -C 2
|
|
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ hg merge
|
|
merging testdir/subdir/a and testdir/a to testdir/subdir/a
|
|
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
|
|
(branch merge, don't forget to commit)
|
|
$ hg stat
|
|
M testdir/subdir/a
|
|
$ hg diff --nodates
|
|
diff -r bc21c9773bfa testdir/subdir/a
|
|
--- a/testdir/subdir/a
|
|
+++ b/testdir/subdir/a
|
|
@@ -1,1 +1,1 @@
|
|
-a
|
|
+alpha
|