upstream/mercurial-mirror Files · tests/test-push-hook-lock.t

update: teach hg to override untracked dir with a tracked file on update...

update: teach hg to override untracked dir with a tracked file on update This is a fix to an old problem when Mercurial got confused by an untracked folder with the same name as one of the files in a commit hg was trying to update to. It is pretty safe to remove this folder if it is empty. Backing up an empty folder seems to go against Mercurial's "don't track dirs" philosophy.

Pierre-Yves David - - Load All Authors

File last commit:

r25126:00e4c560 default


                r29480:1e4512ea

default

Download file

             test-push-hook-lock.t
        
                    50 lines
            
             | 1.3 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-push-hook-lock.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ hg init 1

        $ echo '[ui]' >> 1/.hg/hgrc

        $ echo 'timeout = 10' >> 1/.hg/hgrc

        $ echo foo > 1/foo

        $ hg --cwd 1 ci -A -m foo

        adding foo

        $ hg clone 1 2

        updating to branch default

        1 files updated, 0 files merged, 0 files removed, 0 files unresolved

        $ hg clone 2 3

        updating to branch default

        1 files updated, 0 files merged, 0 files removed, 0 files unresolved

        $ cat <<EOF > $TESTTMP/debuglocks-pretxn-hook.sh

        > hg debuglocks

        > true

        > EOF

        $ echo '[hooks]' >> 2/.hg/hgrc

        $ echo "pretxnchangegroup.a = sh $TESTTMP/debuglocks-pretxn-hook.sh" >> 2/.hg/hgrc

        $ echo 'changegroup.push = hg push -qf ../1' >> 2/.hg/hgrc

        $ echo bar >> 3/foo

        $ hg --cwd 3 ci -m bar

        $ hg --cwd 3 push ../2 --config experimental.bundle2-exp=False

        pushing to ../2

        searching for changes

        adding changesets

        adding manifests

        adding file changes

        added 1 changesets with 1 changes to 1 files

        lock:  user *, process * (*s) (glob)

        wlock: free

        $ hg --cwd 1 --config extensions.strip= strip tip -q

        $ hg --cwd 2 --config extensions.strip= strip tip -q

        $ hg --cwd 3 push ../2 --config experimental.bundle2-exp=True

        pushing to ../2

        searching for changes

        adding changesets

        adding manifests

        adding file changes

        added 1 changesets with 1 changes to 1 files

        lock:  user *, process * (*s) (glob)

        wlock: user *, process * (*s) (glob)

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

				$ hg init 1

				$ echo '[ui]' >> 1/.hg/hgrc
				$ echo 'timeout = 10' >> 1/.hg/hgrc

				$ echo foo > 1/foo
				$ hg --cwd 1 ci -A -m foo
				adding foo

				$ hg clone 1 2
				updating to branch default
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved

				$ hg clone 2 3
				updating to branch default
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved

				$ cat <<EOF > $TESTTMP/debuglocks-pretxn-hook.sh
				> hg debuglocks
				> true
				> EOF
				$ echo '[hooks]' >> 2/.hg/hgrc
				$ echo "pretxnchangegroup.a = sh $TESTTMP/debuglocks-pretxn-hook.sh" >> 2/.hg/hgrc
				$ echo 'changegroup.push = hg push -qf ../1' >> 2/.hg/hgrc

				$ echo bar >> 3/foo
				$ hg --cwd 3 ci -m bar

				$ hg --cwd 3 push ../2 --config experimental.bundle2-exp=False
				pushing to ../2
				searching for changes
				adding changesets
				adding manifests
				adding file changes
				added 1 changesets with 1 changes to 1 files
				lock: user , process (*s) (glob)
				wlock: free

				$ hg --cwd 1 --config extensions.strip= strip tip -q
				$ hg --cwd 2 --config extensions.strip= strip tip -q
				$ hg --cwd 3 push ../2 --config experimental.bundle2-exp=True
				pushing to ../2
				searching for changes
				adding changesets
				adding manifests
				adding file changes
				added 1 changesets with 1 changes to 1 files
				lock: user , process (*s) (glob)
				wlock: user , process (*s) (glob)