2018-01-23 23:09:16 +03:00
|
|
|
$ . helpers-usechg.sh
|
|
|
|
|
2010-08-18 04:35:09 +04:00
|
|
|
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
|
2010-09-03 01:22:51 +04:00
|
|
|
$ hg commit -m a
|
2010-08-18 04:35:09 +04:00
|
|
|
$ 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
|
2010-09-03 01:22:51 +04:00
|
|
|
$ hg commit -m remote-change
|
2010-08-18 04:35:09 +04:00
|
|
|
$ cd ..
|
|
|
|
|
|
|
|
$ cd b
|
|
|
|
$ mkdir testdir/subdir
|
|
|
|
$ hg mv testdir/a testdir/subdir/a
|
2010-09-03 01:22:51 +04:00
|
|
|
$ hg commit -m move
|
2010-08-18 04:35:09 +04:00
|
|
|
$ mkdir newdir
|
|
|
|
$ echo beta > newdir/beta
|
|
|
|
$ hg add newdir/beta
|
2010-09-03 01:22:51 +04:00
|
|
|
$ hg commit -m local-addition
|
2010-08-18 04:35:09 +04:00
|
|
|
$ 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)
|
2017-10-12 10:39:50 +03:00
|
|
|
new changesets cc7000b01af9
|
2010-08-18 04:35:09 +04:00
|
|
|
(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
|
2010-09-03 01:22:51 +04:00
|
|
|
diff -r bc21c9773bfa testdir/subdir/a
|
2010-08-18 04:35:09 +04:00
|
|
|
--- a/testdir/subdir/a
|
|
|
|
+++ b/testdir/subdir/a
|
|
|
|
@@ -1,1 +1,1 @@
|
|
|
|
-a
|
|
|
|
+alpha
|
2012-06-11 03:40:51 +04:00
|
|
|
|
|
|
|
$ cd ..
|