upstream/mercurial-mirror Files · tests/test-confused-revert.out

subrepo: change default path in hgrc of subrepo after cloning...

subrepo: change default path in hgrc of subrepo after cloning Previous behavior was to put in the cloned subrepos the path found in the original main repo. However it isn't valid for relative path and it seems more logical to reference instead the subrepos working copy path of the original main repo.

Dirkjan Ochtman - - Load All Authors

File last commit:

r6336:4b0c9c67 default


                r10378:e1401c74

default

Download file

             test-confused-revert.out
        
                    29 lines
            
             | 715 B
            
                | text/plain
            
             |
                TextLexer

/ tests / test-confused-revert.out

History | Source | Raw |Copy content |Copy permalink

Matt Mackall Add test-confused-revert, fix permissions on test-revert	r1449	%%% should show a removed and b added
		A b
		R a
		reverting...
Vadim Gelfer small changes to revert command....	r2042	undeleting a
Vadim Gelfer rewrite revert command. fix issues 93, 123, 147....	r2029	forgetting b
Matt Mackall Add test-confused-revert, fix permissions on test-revert	r1449	%%% should show b unknown and a back to normal
		? b
Thomas Arendsen Hein Make hg update more verbose by default (issue12)...	r2175	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Dirkjan Ochtman warn about new heads on commit (issue842)	r6336	created new head
Matt Mackall Add test-confused-revert, fix permissions on test-revert	r1449	merging a
Thomas Arendsen Hein Make hg update more verbose by default (issue12)...	r2175	0 files updated, 1 files merged, 0 files removed, 0 files unresolved
		(branch merge, don't forget to commit)
Matt Mackall Add test-confused-revert, fix permissions on test-revert	r1449	%%% should show foo-b
		foo-b
		%%% should show a removed and b added
		A b
		R a
Vadim Gelfer make test-confused-revert check working dir with two parents.	r2214	%%% revert should fail
Brendan Cully cat: default to working dir parent instead of tip...	r3095	abort: uncommitted merge - please provide a specific revision
Vadim Gelfer make test-confused-revert check working dir with two parents.	r2214	%%% revert should be ok now
Vadim Gelfer small changes to revert command....	r2042	undeleting a
Vadim Gelfer rewrite revert command. fix issues 93, 123, 147....	r2029	forgetting b
Matt Mackall Add test-confused-revert, fix permissions on test-revert	r1449	%%% should show b unknown and a marked modified (merged)
Alexis S. L. Carvalho normallookup: during merges, restore the state saved by remove	r6298	M a
Matt Mackall Add test-confused-revert, fix permissions on test-revert	r1449	? b
		%%% should show foo-b
		foo-b

	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