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

[PATCH] Removal of a file added by merging branches...

[PATCH] Removal of a file added by merging branches -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] Removal of a file added by merging branches From: Michael A Fetterman <Michael.Fetterman@cl.cam.ac.uk> Fixing a bug where removal of a file which is added when doing a merge would cause python exception to be thrown. manifest hash: -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuNjLywK+sNU5EO8RAo44AJ4mvjsJcYOj/EmVDFrdkK3D3WHFSwCffxfV cRl8mXc252/oRcYaMZbgrlg= =S5x6 -----END PGP SIGNATURE-----

mpm@selenic.com - - Load All Authors

File last commit:

r402:2fe8d66e default


                r416:5e9e8b8d

default

Download file

             test-merge3
        
                    10 lines
            
             | 165 B
            
                | text/plain
            
             |
                TextLexer

/ tests / test-merge3

History | Annotation | Raw |Copy content |Copy permalink

				#!/bin/sh -x

				hg init
				echo This is file a1 > a
				hg add a
				hg commit -t "commit #0" -d "0 0" -u user
				touch b
				hg add b
				rm b
				hg commit -A -t"comment #1" -d "0 0" -u user

	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