upstream/mercurial-mirror Files · tests/test-push-warn.out

templatekw: change {file_copies} behaviour, add {file_copies_switch}...

templatekw: change {file_copies} behaviour, add {file_copies_switch} {file_copies} template now displays file copies with or without the --copies switch being set. A new {file_copies_switch} template implements the former behaviour.

Sune Foldager - - Load All Authors

File last commit:

r9954:d6a30771 stable


                r10060:f780b109

default

Download file

             test-push-warn.out
        
                    156 lines
            
             | 4.2 KiB
            
                | text/plain
            
             |
                TextLexer

/ tests / test-push-warn.out

History | Source | Raw |Copy content |Copy permalink

Adrian Buehlmann hg.clone: report branch name on update	r9611	updating to branch default
Thomas Arendsen Hein Make hg update more verbose by default (issue12)...	r2175	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
mpm@selenic.com Warn on pushing unsynced repo or adding new heads...	r816	pushing to ../a
		searching for changes
Dirkjan Ochtman warning on push should mention heads, not branches...	r6181	abort: push creates new remote heads!
Matt Mackall correct remote heads test in prepush	r3684	(did you forget to merge? use push -f to force)
mpm@selenic.com Warn on pushing unsynced repo or adding new heads...	r816	pulling from ../a
		searching for changes
		adding changesets
		adding manifests
		adding file changes
mpm@selenic.com Update tests	r1043	added 1 changesets with 1 changes to 1 files (+1 heads)
Vadim Gelfer add merge command. means same thing as "update -m"....	r2019	(run 'hg heads' to see heads, 'hg merge' to merge)
mpm@selenic.com Warn on pushing unsynced repo or adding new heads...	r816	pushing to ../a
		searching for changes
Dirkjan Ochtman warning on push should mention heads, not branches...	r6181	abort: push creates new remote heads!
mpm@selenic.com Warn on pushing unsynced repo or adding new heads...	r816	(did you forget to merge? use push -f to force)
Thomas Arendsen Hein Make hg update more verbose by default (issue12)...	r2175	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		(branch merge, don't forget to commit)
mpm@selenic.com Warn on pushing unsynced repo or adding new heads...	r816	pushing to ../a
		searching for changes
		adding changesets
		adding manifests
		adding file changes
Benoit Boissinot push: use the fast changegroup() path on push...	r7460	added 2 changesets with 1 changes to 1 files
Thomas Arendsen Hein Fix hg push and hg push -r sometimes creating new heads without --force....	r2021	adding foo
Adrian Buehlmann hg.clone: report branch name on update	r9611	updating to branch default
Thomas Arendsen Hein Make hg update more verbose by default (issue12)...	r2175	1 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
Thomas Arendsen Hein Make hg update more verbose by default (issue12)...	r2175	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
Thomas Arendsen Hein Fix hg push and hg push -r sometimes creating new heads without --force....	r2021	merging foo
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)
Thomas Arendsen Hein Fix hg push and hg push -r sometimes creating new heads without --force....	r2021	pushing to ../c
		searching for changes
Dirkjan Ochtman warning on push should mention heads, not branches...	r6181	abort: push creates new remote heads!
Thomas Arendsen Hein Fix hg push and hg push -r sometimes creating new heads without --force....	r2021	(did you forget to merge? use push -f to force)
Alexis S. L. Carvalho push: exit(1) if "push creates new remote branches!"	r6098	1
Thomas Arendsen Hein Fix hg push and hg push -r sometimes creating new heads without --force....	r2021	pushing to ../c
		searching for changes
		no changes found
Thomas Arendsen Hein Don't report an error when closing heads during local push (issue387)	r3803	0
Thomas Arendsen Hein Fix hg push and hg push -r sometimes creating new heads without --force....	r2021	pushing to ../c
		searching for changes
Dirkjan Ochtman warning on push should mention heads, not branches...	r6181	abort: push creates new remote heads!
Matt Mackall correct remote heads test in prepush	r3684	(did you forget to merge? use push -f to force)
Alexis S. L. Carvalho push: exit(1) if "push creates new remote branches!"	r6098	1
Thomas Arendsen Hein Don't report an error when closing heads during local push (issue387)	r3803	pushing to ../c
		searching for changes
Dirkjan Ochtman warning on push should mention heads, not branches...	r6181	abort: push creates new remote heads!
Thomas Arendsen Hein Don't report an error when closing heads during local push (issue387)	r3803	(did you forget to merge? use push -f to force)
Alexis S. L. Carvalho push: exit(1) if "push creates new remote branches!"	r6098	1
Matt Mackall correct remote heads test in prepush	r3684	pushing to ../c
		searching for changes
Matt Mackall Revert push new heads logic...	r2109	adding changesets
		adding manifests
		adding file changes
		added 2 changesets with 2 changes to 1 files (+2 heads)
Thomas Arendsen Hein Don't report an error when closing heads during local push (issue387)	r3803	0
Thomas Arendsen Hein Fix hg push and hg push -r sometimes creating new heads without --force....	r2021	pushing to ../c
		searching for changes
Matt Mackall Revert push new heads logic...	r2109	adding changesets
		adding manifests
		adding file changes
Thomas Arendsen Hein Report on push/pull if heads are merged, too, like for new heads....	r2424	added 1 changesets with 1 changes to 1 files (-1 heads)
Thomas Arendsen Hein Don't report an error when closing heads during local push (issue387)	r3803	0
Benoit Boissinot fix calculation of new heads added during push with -r...	r3923	pushing to ../e
		searching for changes
		adding changesets
		adding manifests
		adding file changes
		added 1 changesets with 1 changes to 1 files
		0
		pushing to ../e
		searching for changes
		adding changesets
		adding manifests
		adding file changes
		added 1 changesets with 1 changes to 1 files
		0
Sune Foldager tests: add tests for new pre-push logic (issue736)...	r8565	% issue 736
		% push on existing branch and new branch
		pushing to ../f
		searching for changes
		abort: push creates new remote branch 'c'!
		(did you forget to merge? use push -f to force)
		1
		% fail on multiple head push
		pushing to ../f
		searching for changes
		abort: push creates new remote heads!
		(did you forget to merge? use push -f to force)
		1
		% push replacement head on existing branches
		pushing to ../f
		searching for changes
		adding changesets
		adding manifests
		adding file changes
		added 2 changesets with 2 changes to 1 files
		0
		% merge of branch a to other branch b followed by unrelated push on branch a
		pushing to ../f
		searching for changes
		adding changesets
		adding manifests
		adding file changes
		added 1 changesets with 1 changes to 1 files (-1 heads)
		0
		pushing to ../f
		searching for changes
		adding changesets
		adding manifests
		adding file changes
		added 1 changesets with 1 changes to 1 files (+1 heads)
		0
		% cheating the counting algorithm
		pushing to ../f
		searching for changes
		adding changesets
		adding manifests
		adding file changes
		added 2 changesets with 2 changes to 1 files
		0
Sune Foldager push: fix subtle bug in prepush logic...	r9479	% checking prepush logic does not allow silently pushing multiple new heads
		adding init
		adding a
Adrian Buehlmann hg.clone: report branch name on update	r9611	updating to branch default
Henrik Stuart tests: fix inadvertent use of existing test repository	r9609	2 files updated, 0 files merged, 0 files removed, 0 files unresolved
		0 files updated, 0 files merged, 1 files removed, 0 files unresolved
Sune Foldager push: fix subtle bug in prepush logic...	r9479	adding b
		created new head
Henrik Stuart tests: fix inadvertent use of existing test repository	r9609	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
Sune Foldager push: fix subtle bug in prepush logic...	r9479	adding c
		created new head
Henrik Stuart tests: fix inadvertent use of existing test repository	r9609	pushing to h
Sune Foldager push: fix subtle bug in prepush logic...	r9479	searching for changes
		abort: push creates new remote heads!
		(did you forget to merge? use push -f to force)

Sune Foldager fix bug in prepush logic involving merge changesets...	r9954	% check prepush logic with merged branches
		marked working directory as branch a
		adding foo
		updating to branch a
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		marked working directory as branch b
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		(branch merge, don't forget to commit)
		pushing to j
		searching for changes
		abort: push creates new remote heads!
		(did you forget to merge? use push -f to force)

	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