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

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

Make contrib/buildrpm work on Fedora 9....
Make contrib/buildrpm work on Fedora 9. mercurial.spec had bitrotted. These changes makes it possible to build an rpm that is usable. Only minimal changes has been made, and there is plenty of room for improvement.
Thomas Arendsen Hein - - Load All Authors

File last commit:

r6381:0b89315d default
r7277:3e000e2b default
Show More
test-merge5.out
7 lines | 266 B | text/plain | TextLexer
/ tests / test-merge5.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
Bryan O'Sullivan
Update tests to match new addremove chattiness.
 r767 removing b
Dirkjan Ochtman
warn about new heads on commit (issue842)
 r6336 created new head
Matt Mackall
update: no -C needed to switch branches without outstanding changes
 r6350 % should abort
Matt Mackall
update: better logic and messages for updates...
 r6375 abort: crosses branches (use 'hg merge' or 'hg update -C' to discard changes)
Matt Mackall
update: no -C needed to switch branches without outstanding changes
 r6350 % should succeed
Thomas Arendsen Hein
Fix missing space in one of the new update messages.
 r6381 abort: crosses branches (use 'hg merge' or 'hg update -C')