upstream/mercurial-mirror Files · tests/test-diff-subdir

commit: when committing the results of a merge, it's all or nothing...

commit: when committing the results of a merge, it's all or nothing Previously, it was possible to commit just one file from a merge, which is essentially always the wrong thing to do. This fixes issue 1049.

Stephen Darnell - - Load All Authors

File last commit:

r3199:096f1c73 default


                r6385:0d4e068e

default

Download file

             test-diff-subdir
        
                    24 lines
            
             | 291 B
            
                | text/plain
            
             |
                TextLexer

/ tests / test-diff-subdir

History | Annotation | Raw |Copy content |Copy permalink

				#!/bin/sh

				hg init

				mkdir alpha
				touch alpha/one
				mkdir beta
				touch beta/two

				hg add alpha/one beta/two
				hg ci -m "start" -d "1000000 0"

				echo 1 > alpha/one
				echo 2 > beta/two

				echo EVERYTHING
				hg diff --nodates

				echo BETA ONLY
				hg diff --nodates beta

				echo INSIDE BETA
				cd beta
				hg diff --nodates .

	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