upstream/mercurial-mirror Files · tests/test-merge5

addremove: correctly handle intermediate symlinks...

addremove: correctly handle intermediate symlinks This fixes problems mentioned in issue660 comments (unrelated to original issue) where directory was renamed, and symlink was added instead. In such situation addremove wasn't able to correctly detect that old files no longer here, but tried to add symlink (and failed due collision with old files).

Matt Mackall - - Load All Authors

File last commit:

r6350:6aa4a3fa default


                r6651:7f0dd352

default

Download file

             test-merge5
        
                    25 lines
            
             | 510 B
            
                | text/plain
            
             |
                TextLexer

/ tests / test-merge5

History | Source | Raw |Copy content |Copy permalink

Thomas Arendsen Hein Don't use 'set -x', fix exports, sed and hexdump usage for Solaris.	r800	#!/bin/sh
mpm@selenic.com [PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted...	r415
		mkdir t
		cd t
		hg init
		echo This is file a1 > a
		echo This is file b1 > b
		hg add a b
Thomas Arendsen Hein Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....	r1933	hg commit -m "commit #0" -d "1000000 0"
mpm@selenic.com [PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted...	r415	echo This is file b22 > b
Thomas Arendsen Hein Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....	r1933	hg commit -m"comment #1" -d "1000000 0"
mpm@selenic.com [PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted...	r415	hg update 0
		rm b
Thomas Arendsen Hein Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....	r1933	hg commit -A -m"comment #2" -d "1000000 0"
Matt Mackall update: no -C needed to switch branches without outstanding changes	r6350	mv a c
Thomas Arendsen Hein Don't require the "yes" command for test-merge5.	r1963	# in theory, we shouldn't need the "-y" below, but it prevents
mpm@selenic.com [PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted...	r415	# this test from hanging when "hg update" erroneously prompts the
		# user for "keep or delete"
Matt Mackall update: no -C needed to switch branches without outstanding changes	r6350	echo % should abort
		hg update -y 1
		mv c a
		echo % should succeed
Thomas Arendsen Hein Don't require the "yes" command for test-merge5.	r1963	hg update -y 1

mpm@selenic.com [PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted...	r415	exit 0

	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