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

fix pull racing with push/commit (issue1320)...

fix pull racing with push/commit (issue1320) changegroup() has a problem when nodes which does not descend from a node in <bases> are added to remote after the discovery phase. If that happens, changegroup() won't send the correct set of nodes, ie. some nodes will be missing. To correct it we have to find the set of nodes that both remote and self have (called <common>), and send all the nodes not in <common>. This fix has some overhead, in the worst case it will re-send a whole branch. A proper fix to avoid this overhead might be to change the protocol so that the <common> nodes are sent (instead of the <bases> of the missing nodes).

Benoit Boissinot - - Load All Authors

File last commit:

r7233:9f0e52e1 default


                r7233:9f0e52e1

default

Download file

             test-push-warn.out
        
                    82 lines
            
             | 2.2 KiB
            
                | text/plain
            
             |
                TextLexer

/ tests / test-push-warn.out

History | Source | Raw |Copy content |Copy permalink

Adrian Buehlmann clone: print "updating working directory" status message...	r6338	updating working directory
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 fix pull racing with push/commit (issue1320)...	r7233	added 2 changesets with 1 changes to 2 files
Thomas Arendsen Hein Fix hg push and hg push -r sometimes creating new heads without --force....	r2021	adding foo
Adrian Buehlmann clone: print "updating working directory" status message...	r6338	updating working directory
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

	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