upstream/mercurial-mirror Files · tests/test-add.out

clone: print "updating working directory" status message...

clone: print "updating working directory" status message With this change, "hg clone" looks like this: % hg clone http://example.com/repo/big big requesting all changes adding changesets adding manifests adding file changes added XXX changesets with XXX changes to XXX files updating working directory XXX files updated, XXX files merged, XXX files removed, XXX files unresolved So the user sees % hg clone http://example.com/repo/big big requesting all changes adding changesets adding manifests adding file changes added XXX changesets with XXX changes to XXX files updating working directory while Mercurial is writing to disk to populate the working directory With this change, "hg clone" looks like this: % hg clone big big-work updating working directory XXX files updated, XXX files merged, XXX files removed, XXX files unresolved

Dirkjan Ochtman - - Load All Authors

File last commit:

r6336:4b0c9c67 default


                r6338:0750f111

default

Download file

             test-add.out
        
                    39 lines
            
             | 575 B
            
                | text/plain
            
             |
                TextLexer

/ tests / test-add.out

History | Source | Raw |Copy content |Copy permalink

Benoit Boissinot make hg add of a removed file unremove the file...	r5207	adding a
		? a
		adding a
		A a
		A a
		? b
		A a
		A b
		% should fail
		b already tracked!
		A a
		A b
		% should fail
		a already tracked!
		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 merge: allow smarter tool configuration...	r6004	merging a
Benoit Boissinot make hg add of a removed file unremove the file...	r5207	warning: conflicts during merge.
		merging a failed!
		0 files updated, 0 files merged, 0 files removed, 1 files unresolved
		There are unresolved merges, you can redo the full merge using:
		hg update -C 2
		hg merge 1
		M a
Matt Mackall merge: allow smarter tool configuration...	r6004	? a.orig
Benoit Boissinot make hg add of a removed file unremove the file...	r5207	% should fail
		a already tracked!
		M a
Matt Mackall merge: allow smarter tool configuration...	r6004	? a.orig
Benoit Boissinot make hg add of a removed file unremove the file...	r5207	% issue683
		R a
Matt Mackall merge: allow smarter tool configuration...	r6004	? a.orig
Benoit Boissinot make hg add of a removed file unremove the file...	r5207	M a
Matt Mackall merge: allow smarter tool configuration...	r6004	? a.orig
Patrick Mezard commands: add exits(1) if a specified file cannot be added (issue 891)	r5688	c does not exist!
		d does not exist!
		M a
		A c
Matt Mackall merge: allow smarter tool configuration...	r6004	? a.orig

	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