upstream/mercurial-mirror Files · tests/test-excessive-merge

diff: add --inverse option...

diff: add --inverse option Most of the time, one can reverse a diff by swapping the revisions passed with -r but it happens that if you use the global -R, and diff against the tip of the current repo, you can't swap the revisions. One use-case for that is reviewing changes from a bundle before unbundling. One could also pipe the output of `hg diff` to a command line filter that reverses the diff, but that would remove the benefit from color diffs. Therefore, having an option in `hg diff` to reverse a diff is a good thing. The option flag selection was tricky. GNU patch uses -R/--reverse but -R is already used as a global option and --reverse would make --rev ambiguous.

Benoit Boissinot - - Load All Authors

File last commit:

r3853:c0b44915 default


                r9725:3f522d2f

default

Download file

             test-excessive-merge
        
                    46 lines
            
             | 566 B
            
                | text/plain
            
             |
                TextLexer

/ tests / test-excessive-merge

History | Source | Raw |Copy content |Copy permalink

Matt Mackall Refactor excessive merge detection, add test	r1716	#!/bin/sh

		hg init

		echo foo > a
		echo foo > b
		hg add a b

Thomas Arendsen Hein Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....	r1933	hg ci -m "test" -d "1000000 0"
Matt Mackall Refactor excessive merge detection, add test	r1716
		echo blah > a

Thomas Arendsen Hein Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....	r1933	hg ci -m "branch a" -d "1000000 0"
Matt Mackall Refactor excessive merge detection, add test	r1716
		hg co 0

		echo blah > b

Thomas Arendsen Hein Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....	r1933	hg ci -m "branch b" -d "1000000 0"
Vadim Gelfer deprecate 'update -m'. use 'merge' instead.	r2283	HGMERGE=true hg merge 1
Matt Mackall Refactor excessive merge detection, add test	r1716
Thomas Arendsen Hein Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....	r1933	hg ci -m "merge b/a -> blah" -d "1000000 0"
Matt Mackall Refactor excessive merge detection, add test	r1716
		hg co 1
Vadim Gelfer deprecate 'update -m'. use 'merge' instead.	r2283	HGMERGE=true hg merge 2
Thomas Arendsen Hein Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....	r1933	hg ci -m "merge a/b -> blah" -d "1000000 0"
Matt Mackall Refactor excessive merge detection, add test	r1716
		hg log
Benoit Boissinot switch to the .hg/store layout, fix the tests	r3853	hg debugindex .hg/store/00changelog.i
Matt Mackall Refactor excessive merge detection, add test	r1716
		echo

		echo 1
Matt Mackall make manifest friendlier...	r3736	hg manifest --debug 1
Matt Mackall Refactor excessive merge detection, add test	r1716	echo 2
Matt Mackall make manifest friendlier...	r3736	hg manifest --debug 2
Matt Mackall Refactor excessive merge detection, add test	r1716	echo 3
Matt Mackall make manifest friendlier...	r3736	hg manifest --debug 3
Matt Mackall Refactor excessive merge detection, add test	r1716	echo 4
Matt Mackall make manifest friendlier...	r3736	hg manifest --debug 4
Matt Mackall Refactor excessive merge detection, add test	r1716
		echo

Benoit Boissinot switch to the .hg/store layout, fix the tests	r3853	hg debugindex .hg/store/data/a.i
Matt Mackall Refactor excessive merge detection, add test	r1716
Vadim Gelfer deprecate 'update -m'. use 'merge' instead.	r2283	hg verify

	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