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

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

Make hg update more verbose by default (issue12)...
Make hg update more verbose by default (issue12) (including small changes to revert and backout to not show these stats with the exception of backout --merge) Show update stats (unless -q), e.g.: K files updated, L files merged, M files removed, N files unresolved Inform the user what to do after a merge: (branch merge, don't forget to commit) Inform the user what to do if a branch merge failed: There are unresolved merges, you can redo the full merge using: hg update -C X hg merge Y Inform the user what to do if a working directory merge failed: There are unresolved merges with locally modified files.
Thomas Arendsen Hein - - Load All Authors

File last commit:

r2175:b2ae81a7 default
r2175:b2ae81a7 default
Show More
test-push-warn.out
50 lines | 1.5 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
abort: unsynced remote changes!
(did you forget to sync? use push -f to force)
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
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
added 1 changesets with 1 changes to 1 files