##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

diff: better detection of renames when comparing with the working dir.
diff: better detection of renames when comparing with the working dir.
Matt Mackall - - Load All Authors

File last commit:

r3684:975c2469 default
r3696:562a6563 default
Show More
test-push-warn.out
54 lines | 1.7 KiB | text/plain | TextLexer
/ tests / test-push-warn.out
History | Source | Raw |Copy content |Copy permalink
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
Matt Mackall
correct remote heads test in prepush
 r3684 abort: push creates new remote branches!
(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
abort: push creates new remote branches!
(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
mpm@selenic.com
Fix long-standing excessive file merges...
 r990 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
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
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
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
abort: push creates new remote branches!
(did you forget to merge? use push -f to force)
pushing to ../c
searching for changes
no changes found
pushing to ../c
searching for changes
Matt Mackall
correct remote heads test in prepush
 r3684 abort: push creates new remote branches!
(did you forget to merge? use push -f to force)
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
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)