Mercurial > hg
view tests/test-issue1502.t @ 44748:a467416c493c stable
rust-status: check for '.hg' regardless of file type (issue6300)
'.hg' would show up in `hg status` if were a symlink.
Differential Revision: https://phab.mercurial-scm.org/D8461
author | Raphaël Gomès <rgomes@octobus.net> |
---|---|
date | Thu, 23 Apr 2020 09:59:38 +0200 |
parents | 4441705b7111 |
children |
line wrap: on
line source
https://bz.mercurial-scm.org/1502 Initialize repository $ hg init foo $ touch foo/a && hg -R foo commit -A -m "added a" adding a $ hg clone foo foo1 updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ echo "bar" > foo1/a && hg -R foo1 commit -m "edit a in foo1" $ echo "hi" > foo/a && hg -R foo commit -m "edited a foo" $ hg -R foo1 pull pulling from $TESTTMP/foo searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) new changesets 273d008d6e8e (run 'hg heads' to see heads, 'hg merge' to merge) $ hg -R foo1 book branchy $ hg -R foo1 book * branchy 1:e3e522925eff Pull. Bookmark should not jump to new head. $ echo "there" >> foo/a && hg -R foo commit -m "edited a again" $ hg -R foo1 pull pulling from $TESTTMP/foo searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files new changesets 84a798d48b17 (run 'hg update' to get a working copy) $ hg -R foo1 book * branchy 1:e3e522925eff