2018-01-23 23:09:16 +03:00
|
|
|
$ . helpers-usechg.sh
|
|
|
|
|
2010-08-18 04:25:56 +04:00
|
|
|
Test for changeset ba7c74081861
|
|
|
|
(update dirstate correctly for non-branchmerge updates)
|
|
|
|
$ hg init a
|
|
|
|
$ cd a
|
|
|
|
$ echo a > a
|
|
|
|
$ hg add 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
|
|
|
|
$ hg mv a b
|
|
|
|
$ hg commit -m move
|
|
|
|
$ echo b >> b
|
|
|
|
$ hg commit -m b
|
|
|
|
$ cd ../b
|
|
|
|
$ hg pull ../a
|
|
|
|
pulling from ../a
|
|
|
|
searching for changes
|
|
|
|
adding changesets
|
|
|
|
adding manifests
|
|
|
|
adding file changes
|
|
|
|
added 2 changesets with 2 changes to 1 files
|
2017-10-12 10:39:50 +03:00
|
|
|
new changesets e3c9b40284e1:772b37f1ca37
|
2010-08-18 04:25:56 +04:00
|
|
|
(run 'hg update' to get a working copy)
|
|
|
|
$ hg update
|
|
|
|
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
2012-06-11 03:40:51 +04:00
|
|
|
|
|
|
|
$ cd ..
|